From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch | 39 ----------- net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch | 19 ----- net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch | 21 ------ .../sks/files/sks-1.1.6_p20200624-QA-fixups.patch | 71 +++++++++++++++++++ ...s-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch | 81 ++++++++++++++++++++++ 5 files changed, 152 insertions(+), 79 deletions(-) delete mode 100644 net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch delete mode 100644 net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch delete mode 100644 net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch create mode 100644 net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch create mode 100644 net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch (limited to 'net-misc/sks/files') diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch deleted file mode 100644 index c9afc2594091..000000000000 --- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch +++ /dev/null @@ -1,39 +0,0 @@ -Use ocamlfind for finding dependencies, esp. for doing their transitive closure. - -Ideally the build system should be converted to something more modern like -jbuilder. - -Index: sks-1.1.6/Makefile -=================================================================== ---- sks-1.1.6.orig/Makefile -+++ sks-1.1.6/Makefile -@@ -21,10 +21,10 @@ CFLAGS=-O3 $(CINCLUDES) -I . - CXXFLAGS=-O3 $(CINCLUDES) -I . - - ifndef OCAMLC -- OCAMLC=ocamlc -+ OCAMLC=ocamlfind ocamlc - endif - ifndef OCAMLOPT -- OCAMLOPT=ocamlopt -+ OCAMLOPT=ocamlfind ocamlopt - endif - ifndef CAMLP4O - CAMLP4O=camlp4o -@@ -55,12 +55,12 @@ WARNERR=-warn-error A - endif - - CAMLP4=-pp $(CAMLP4O) --CAMLINCLUDE= -I lib -I bdb -I +cryptokit -+CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb - COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) - OCAMLDEP=ocamldep $(CAMLP4) --CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma --OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS) --OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa) -+CAMLLIBS=bdb.cma nums.cma -+OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) -+OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa) - - EXE=sks sks_add_mail - ALL=$(EXE) sks.8.gz diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch deleted file mode 100644 index 1fba250fd4b3..000000000000 --- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Kristian Fiskerstrand -# Date 1499610580 -7200 -# Node ID 719ffdf628a81a2f052f3b6dc746a3e1d37afe30 -# Parent 6352f0dbcadf35aac29c2fbf10fb218ae50d9c77 -Fix nums specification - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,7 @@ - CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb - COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) - OCAMLDEP=ocamldep $(CAMLP4) --CAMLLIBS=bdb.cma nums.cma -+CAMLLIBS=bdb.cma - OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) - OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa) - diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch deleted file mode 100644 index ea5a82db6530..000000000000 --- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch +++ /dev/null @@ -1,21 +0,0 @@ -# HG changeset patch -# User Kristian Fiskerstrand -# Date 1499612080 -7200 -# Node ID 0106ba2f6abc8ee2f685026d3f218730114a60fa -# Parent 719ffdf628a81a2f052f3b6dc746a3e1d37afe30 -Add num to findlib packages - -Although nums is detected, making this explicit - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -53,7 +53,7 @@ - endif - - CAMLP4=-pp $(CAMLP4O) --CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb -+CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I lib -I bdb - COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) - OCAMLDEP=ocamldep $(CAMLP4) - CAMLLIBS=bdb.cma diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch new file mode 100644 index 000000000000..3657a8bd5f07 --- /dev/null +++ b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch @@ -0,0 +1,71 @@ +diff --git a/Makefile b/Makefile +index f182225..c84368e 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,8 +15,8 @@ + # USA + # + CINCLUDES=-I$(shell ocamlc -where) +-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I . +-CXXFLAGS+=-O3 $(CINCLUDES) -I . ++CFLAGS+=$(CINCLUDES) -I . ++CXXFLAGS+=$(CINCLUDES) -I . + + ifndef OCAMLC + OCAMLC=ocamlfind ocamlc +@@ -60,8 +60,8 @@ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) + OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa) + + EXE=sks sks_add_mail +-ALL=$(EXE) sks.8.gz +-ALL.bc=$(EXE:=.bc) sks.8.gz ++ALL=$(EXE) sks.8 ++ALL.bc=$(EXE:=.bc) sks.8 + + all: $(ALL) + all.bc: $(ALL.bc) +@@ -132,13 +132,13 @@ install: + mkdir -p $(DESTDIR)$(PREFIX)/bin + install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(MANDIR)/man8 +- install sks.8.gz $(DESTDIR)$(MANDIR)/man8 ++ install sks.8 $(DESTDIR)$(MANDIR)/man8 + + install.bc: + mkdir -p $(DESTDIR)$(PREFIX)/bin + install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(MANDIR)/man8 +- install sks.8.gz $(DESTDIR)$(MANDIR)/man8 ++ install sks.8 $(DESTDIR)$(MANDIR)/man8 + + + Makefile.local: +@@ -151,9 +151,6 @@ src: + + # Ordinary targets + +-sks.8.gz: sks.8 +- gzip -9nf sks.8 +- + sks.8: sks.pod + pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8 + +diff --git a/bdb/Makefile b/bdb/Makefile +index 0913014..4a68399 100644 +--- a/bdb/Makefile ++++ b/bdb/Makefile +@@ -15,11 +15,11 @@ + -include ../Makefile.local + + CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE) +-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I . +-CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I . ++CFLAGS+=$(CINCLUDES) $(BDBLIB) -I . ++CXXFLAGS+=$(CINCLUDES) $(BDBLIB) -I . + + MKLIB=ocamlmklib +-RANLIB=ranlib ++RANLIB?=ranlib + OCAMLDEP=ocamldep $(PP) + CAMLINCLUDE= + COMMONCAMLFLAGS= $(CAMLINCLUDE) $(PP) #-thread diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch new file mode 100644 index 000000000000..02da8d2d2e76 --- /dev/null +++ b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch @@ -0,0 +1,81 @@ +https://sources.debian.org/src/sks/1.1.6+git20200620.9e9d504-1/debian/patches/0008-accept-and-use-CFLAGS-and-CPPFLAGS-from-environment.patch/ +---- +From: Daniel Kahn Gillmor +Date: Mon, 8 Aug 2016 13:20:38 -0400 +Subject: accept and use CFLAGS and CPPFLAGS from environment + +--- + Makefile | 9 +++++---- + bdb/Makefile | 14 ++++++++------ + 2 files changed, 13 insertions(+), 10 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + # USA + # +-CINCLUDES=-I`ocamlc -where` ++CINCLUDES=-I$(shell ocamlc -where) + CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I . + CXXFLAGS+=-O3 $(CINCLUDES) -I . + +@@ -43,6 +43,7 @@ else + endif + + CAMLLDFLAGS=$(foreach x, $(LDFLAGS), -ccopt $(x)) ++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x)) + + SKSVS=$(shell grep 'version_suffix = "+"' common.ml) + ifeq ($(strip $(SKSVS)),) +@@ -52,7 +53,7 @@ WARNERR=-warn-error A + endif + + CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I bdb +-COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR) ++COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLCFLAGS) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR) + OCAMLDEP=ocamldep + CAMLLIBS=bdb.cma + OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) +--- a/bdb/Makefile ++++ b/bdb/Makefile +@@ -14,7 +14,7 @@ + # $Id: Makefile,v 1.6 2003/07/05 15:16:29 yminsky Exp $ + -include ../Makefile.local + +-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE) ++CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE) + CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I . + CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I . + +@@ -27,6 +27,8 @@ CAMLLIBS=unix.cma str.cma mylibs.cma + OCAMLFLAGS=$(COMMONCAMLFLAGS) -g + OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 + ++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x)) ++ + ifndef LIBDB + LIBDB=-ldb-4.6 + endif +@@ -37,7 +39,7 @@ ocextr: ocextr.ml + $(OCAMLC) -o ocextr ocextr.ml + + libbdb.a: $(COBJS) +- $(MKLIB) -custom -o bdb $(COBJS) ++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb $(COBJS) + + bdb_stubs.o: bdb_stubs.h bdb_stubs.c + +@@ -45,10 +47,10 @@ bdb.ml: ocextr bdb_stubs.c + ./ocextr bdb_stubs.c > bdb.ml + + bdb.cma: bdb.cmo libbdb.a +- $(MKLIB) -custom -o bdb bdb.cmo -lbdb $(LIBDB) ++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmo -lbdb $(LIBDB) + + bdb.cmxa: bdb.cmx libbdb.a +- $(MKLIB) -custom -o bdb bdb.cmx -lbdb $(LIBDB) ++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmx -lbdb $(LIBDB) + + bdbcaml: bdb.cma + ocamlmktop -o bdbcaml -custom unix.cma bdb.cma $^ -- cgit v1.2.3