diff options
| author | wiz <wiz@pkgsrc.org> | 2020-12-10 21:37:07 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-12-10 21:37:07 +0000 |
| commit | d22b71844ca2ab1c23202f253eccadf9c5a8e8fd (patch) | |
| tree | 2cb582de3d23a0d6cfbc5bae4b70141ff8e4d45e /lang | |
| parent | e4c8e860850895ee2ed78ca1551b8b2d049e1eb1 (diff) | |
| download | pkgsrc-d22b71844ca2ab1c23202f253eccadf9c5a8e8fd.tar.gz | |
ocaml: honor LDFLAGS in one more place to fix RELRO builds
From jaapb, thanks!
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ocaml/distinfo | 3 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-otherlibs_unix_Makefile | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 99a7a1f34a4..3e7519b9051 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.138 2020/12/09 10:33:04 jaapb Exp $ +$NetBSD: distinfo,v 1.139 2020/12/10 21:37:07 wiz Exp $ SHA1 (ocaml-4.11.1.tar.gz) = a3f3d74a43a3d0054f0d0162522499f7d8958560 RMD160 (ocaml-4.11.1.tar.gz) = 6bdd83aeab8a074cfeffa475fe2db72cbca2d6cf @@ -16,6 +16,7 @@ SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb573 SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 05f14ad2635bfd2ded98ef38ac6e7578b5cfc08e SHA1 (patch-otherlibs_systhreads_Makefile) = ff2cf90527bda37474097bb576bccbf7329c4f1d SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1 +SHA1 (patch-otherlibs_unix_Makefile) = ebcd541dc3b425c96b00f457c4779bd35976c3f4 SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb SHA1 (patch-runtime_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa diff --git a/lang/ocaml/patches/patch-otherlibs_unix_Makefile b/lang/ocaml/patches/patch-otherlibs_unix_Makefile new file mode 100644 index 00000000000..c8b9c065216 --- /dev/null +++ b/lang/ocaml/patches/patch-otherlibs_unix_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-otherlibs_unix_Makefile,v 1.1 2020/12/10 21:37:07 wiz Exp $ + +Honor LDFLAGS to fix RELRO build. + +--- otherlibs/unix/Makefile.orig 2020-09-01 12:47:58.000000000 +0000 ++++ otherlibs/unix/Makefile +@@ -20,7 +20,7 @@ LIBNAME=unix + EXTRACAMLFLAGS=-nolabels + + # dllunix.so particularly requires libm for modf symbols +-LDOPTS=$(NATIVECCLIBS) ++LDOPTS=$(NATIVECCLIBS) "$(LDFLAGS)" + + COBJS=accept.o access.o addrofstr.o alarm.o bind.o channels.o chdir.o \ + chmod.o chown.o chroot.o close.o fsync.o closedir.o connect.o cst2constr.o \ |