summaryrefslogtreecommitdiff
path: root/security/sks/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'security/sks/files/patch-Makefile')
-rw-r--r--security/sks/files/patch-Makefile50
1 files changed, 50 insertions, 0 deletions
diff --git a/security/sks/files/patch-Makefile b/security/sks/files/patch-Makefile
new file mode 100644
index 000000000000..86d7c495fa7a
--- /dev/null
+++ b/security/sks/files/patch-Makefile
@@ -0,0 +1,50 @@
+--- Makefile.orig 2019-06-06 15:28:32 UTC
++++ Makefile
+@@ -15,9 +15,8 @@
+ # USA
+ #
+ CINCLUDES=-I`ocamlc -where`
+-CC=gcc
+ CXX=g++
+-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
++CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+ CXXFLAGS=-O3 $(CINCLUDES) -I .
+
+ ifndef OCAMLC
+@@ -135,16 +134,16 @@ keyMerge.cmx: keyMerge.ml
+ # Special targets
+
+ install:
+- mkdir -p $(PREFIX)/bin
+- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
+- mkdir -p $(MANDIR)/man8
+- install sks.8.gz $(MANDIR)/man8
++ 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.bc:
+- mkdir -p $(PREFIX)/bin
+- install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
+- mkdir -p $(MANDIR)/man8
+- install sks.8.gz $(MANDIR)/man8
++ 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
+
+
+ Makefile.local:
+@@ -285,8 +284,9 @@ CKDIR=$(CKVER)/src
+
+ $(CKVER)/README.txt:
+ tar xmvfz $(CKVER).tar.gz
+- patch -p 0 < $(CKVER)-sks.patch
+- patch -p 0 < $(CKVER)-sks-custom_compare.patch
++ patch -p0 < $(CKVER)-sks.patch
++ patch -p0 < $(CKVER)-sks-custom_compare.patch
++ sed -i.bak -e 's,uint32,&_t,' $(CKDIR)/stubs-md5.c
+
+ $(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
+ cd $(CKDIR) && $(MAKE) all