summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2021-01-08 12:28:16 +0000
committerjperkin <jperkin@pkgsrc.org>2021-01-08 12:28:16 +0000
commit63046806fc8a409a08c16493cea1b64bbdf7b4be (patch)
tree741844de218624c990d8d4be33eeec3868aac7c8 /lang/ocaml
parentb37084e89bf6994669f2ad0f3ba5cb9ff69b11d3 (diff)
downloadpkgsrc-63046806fc8a409a08c16493cea1b64bbdf7b4be.tar.gz
ocaml: Fix previous correctly.
Diffstat (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/distinfo4
-rw-r--r--lang/ocaml/patches/patch-otherlibs_unix_Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index cbd2f1e1f28..89736e51763 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.140 2021/01/04 07:58:55 jperkin Exp $
+$NetBSD: distinfo,v 1.141 2021/01/08 12:28:16 jperkin Exp $
SHA1 (ocaml-4.11.1.tar.gz) = a3f3d74a43a3d0054f0d0162522499f7d8958560
RMD160 (ocaml-4.11.1.tar.gz) = 6bdd83aeab8a074cfeffa475fe2db72cbca2d6cf
@@ -16,7 +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) = 68bae7e3630fdfab73b562183c9c9bfa0f59a7ff
+SHA1 (patch-otherlibs_unix_Makefile) = 84f236dab98d684e70fe92294779e65ce3f11e7f
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
index 93b1413979a..b764781cd61 100644
--- a/lang/ocaml/patches/patch-otherlibs_unix_Makefile
+++ b/lang/ocaml/patches/patch-otherlibs_unix_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-otherlibs_unix_Makefile,v 1.2 2021/01/04 07:58:55 jperkin Exp $
+$NetBSD: patch-otherlibs_unix_Makefile,v 1.3 2021/01/08 12:28:16 jperkin Exp $
Honor LDFLAGS to fix RELRO build.
@@ -9,7 +9,7 @@ Honor LDFLAGS to fix RELRO build.
# dllunix.so particularly requires libm for modf symbols
-LDOPTS=$(NATIVECCLIBS)
-+LDOPTS=$(NATIVECCLIBS) $(LDFLAGS)
++LDOPTS=$(NATIVECCLIBS) -ldopt "$(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 \