Fri Oct 27 23:30:07 2017 UTC ()
Really honour LDFLAGS when building ocamlyacc

This fixes building lang/ocaml with RELRO.


(khorben)
diff -r1.112 -r1.113 pkgsrc/lang/ocaml/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile
cvs diff -r1.112 -r1.113 pkgsrc/lang/ocaml/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/distinfo 2017/10/17 08:26:48 1.112
+++ pkgsrc/lang/ocaml/distinfo 2017/10/27 23:30:07 1.113
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.112 2017/10/17 08:26:48 wiz Exp $ 1$NetBSD: distinfo,v 1.113 2017/10/27 23:30:07 khorben Exp $
2 2
3SHA1 (ocaml-4.05.0.tar.gz) = ef9e3febed311cf9331baefd2999961b36f849cb 3SHA1 (ocaml-4.05.0.tar.gz) = ef9e3febed311cf9331baefd2999961b36f849cb
4RMD160 (ocaml-4.05.0.tar.gz) = 67b299c3abe032f955e95eac106c32664351453c 4RMD160 (ocaml-4.05.0.tar.gz) = 67b299c3abe032f955e95eac106c32664351453c
5SHA512 (ocaml-4.05.0.tar.gz) = 9ad68932d7ae9e33fa0f84da7288c47d518d1ef367204f6415caee000feeb8fae2ea079b1d9fa780e9470608df9e030632f4377d320236d0389991aceec94b69 5SHA512 (ocaml-4.05.0.tar.gz) = 9ad68932d7ae9e33fa0f84da7288c47d518d1ef367204f6415caee000feeb8fae2ea079b1d9fa780e9470608df9e030632f4377d320236d0389991aceec94b69
6Size (ocaml-4.05.0.tar.gz) = 3913079 bytes 6Size (ocaml-4.05.0.tar.gz) = 3913079 bytes
7SHA1 (patch-Makefile) = 557a2a34d09e7c063b34d9b97b4e3d1a8e4cd902 7SHA1 (patch-Makefile) = 557a2a34d09e7c063b34d9b97b4e3d1a8e4cd902
8SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f 8SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
9SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72 9SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
10SHA1 (patch-asmrun_signals__osdep.h) = fa0c6981ca08d1114a377df1720ad866b94eff43 10SHA1 (patch-asmrun_signals__osdep.h) = fa0c6981ca08d1114a377df1720ad866b94eff43
11SHA1 (patch-byterun_Makefile) = 28b8298093a439fe1418dc91bb8a06da9870bfab 11SHA1 (patch-byterun_Makefile) = 28b8298093a439fe1418dc91bb8a06da9870bfab
12SHA1 (patch-configure) = 7022f94813bbb49d4e4d87228b4de19b28065c1a 12SHA1 (patch-configure) = 7022f94813bbb49d4e4d87228b4de19b28065c1a
13SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306 13SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
14SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991 14SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
@@ -21,14 +21,14 @@ SHA1 (patch-ocamldoc_odoc__messages.ml)  @@ -21,14 +21,14 @@ SHA1 (patch-ocamldoc_odoc__messages.ml)
21SHA1 (patch-otherlibs_Makefile) = e7b777dd1c5723eb5950db38525fd9565258801f 21SHA1 (patch-otherlibs_Makefile) = e7b777dd1c5723eb5950db38525fd9565258801f
22SHA1 (patch-otherlibs_bigarray_mmap__unix.c) = 39979990e3463c944598ac0d0bf8a2c4a3f0d558 22SHA1 (patch-otherlibs_bigarray_mmap__unix.c) = 39979990e3463c944598ac0d0bf8a2c4a3f0d558
23SHA1 (patch-otherlibs_dynlink_Makefile) = 9586542c6aa2f618a5d9df62bcb7bfac34ce1163 23SHA1 (patch-otherlibs_dynlink_Makefile) = 9586542c6aa2f618a5d9df62bcb7bfac34ce1163
24SHA1 (patch-otherlibs_systhreads_Makefile) = edf1c481d57f42da9d0cb2699aa39c93eb46265e 24SHA1 (patch-otherlibs_systhreads_Makefile) = edf1c481d57f42da9d0cb2699aa39c93eb46265e
25SHA1 (patch-otherlibs_threads_Makefile) = b25c0003a4e4304b6751ec90bdb99aae7a24cf70 25SHA1 (patch-otherlibs_threads_Makefile) = b25c0003a4e4304b6751ec90bdb99aae7a24cf70
26SHA1 (patch-stdlib_Makefile) = 4832d06bf0d0873ddf814e77f6085a2acf2b8988 26SHA1 (patch-stdlib_Makefile) = 4832d06bf0d0873ddf814e77f6085a2acf2b8988
27SHA1 (patch-testsuite_tests_lib-dynlink-native_Makefile) = aad24bed515295fe0262ab09d015f3afbe2f3bc4 27SHA1 (patch-testsuite_tests_lib-dynlink-native_Makefile) = aad24bed515295fe0262ab09d015f3afbe2f3bc4
28SHA1 (patch-testsuite_tests_tool-ocamldoc-man_Makefile) = 670c9ecc83ae3b83c2232f9f182ccd21624bfed0 28SHA1 (patch-testsuite_tests_tool-ocamldoc-man_Makefile) = 670c9ecc83ae3b83c2232f9f182ccd21624bfed0
29SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99 29SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
30SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d 30SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d
31SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a 31SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a
32SHA1 (patch-utils_clflags.ml) = d16832fedb5db08d035f1661eaf9c3b48411bc69 32SHA1 (patch-utils_clflags.ml) = d16832fedb5db08d035f1661eaf9c3b48411bc69
33SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995 33SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995
34SHA1 (patch-yacc_Makefile) = e7e77becbc1872fedd37bdeb4614739eb67977c8 34SHA1 (patch-yacc_Makefile) = 5a150661d2c3ebbee52131adbed1efbe69da90ef
cvs diff -r1.1 -r1.2 pkgsrc/lang/ocaml/patches/patch-yacc_Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/patches/patch-yacc_Makefile 2017/07/17 23:26:23 1.1
+++ pkgsrc/lang/ocaml/patches/patch-yacc_Makefile 2017/10/27 23:30:07 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-yacc_Makefile,v 1.1 2017/07/17 23:26:23 wiz Exp $ 1$NetBSD: patch-yacc_Makefile,v 1.2 2017/10/27 23:30:07 khorben Exp $
2 2
3Honor LDFLAGS when building ocamlyacc. 3Honor LDFLAGS when building ocamlyacc.
4 4
5--- yacc/Makefile.orig 2017-06-23 15:13:40.000000000 +0000 5--- yacc/Makefile.orig 2017-07-13 08:56:45.000000000 +0000
6+++ yacc/Makefile 6+++ yacc/Makefile
7@@ -27,7 +27,7 @@ OBJS= closure.$(O) error.$(O) lalr.$(O)  7@@ -33,7 +33,7 @@ OBJS= closure.$(O) error.$(O) lalr.$(O)
8 all: ocamlyacc$(EXE) 8 all: ocamlyacc$(EXE)
9  9
10 ocamlyacc$(EXE): $(OBJS) 10 ocamlyacc$(EXE): $(OBJS)
11- $(MKEXE) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS) 11- $(MKEXE) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
12+ $(MKEXE) $(BYTECCLINKOPTS) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS) 12+ $(MKEXE) $(BYTECCLIBS) -o ocamlyacc$(EXE) $(OBJS) $(EXTRALIBS)
13  13
14 version.h : ../VERSION 14 version.h : ../VERSION
15 echo "#define OCAML_VERSION \"`sed -e 1q $^ | tr -d '\r'`\"" > $@ 15 echo "#define OCAML_VERSION \"`sed -e 1q $^ | tr -d '\r'`\"" > $@