CVS commit: pkgsrc/lang/ocaml

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 10 21:37:07 UTC 2020

Modified Files:
        pkgsrc/lang/ocaml: distinfo
Added Files:
        pkgsrc/lang/ocaml/patches: patch-otherlibs_unix_Makefile

Log Message:
ocaml: honor LDFLAGS in one more place to fix RELRO builds

>From jaapb, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.138 pkgsrc/lang/ocaml/distinfo:1.139
--- pkgsrc/lang/ocaml/distinfo:1.138    Wed Dec  9 10:33:04 2020
+++ pkgsrc/lang/ocaml/distinfo  Thu Dec 10 21:37:07 2020
@@ -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) 
 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

Added files:

Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile:1.1
--- /dev/null   Thu Dec 10 21:37:07 2020
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile     Thu Dec 10 21:37:07 2020
@@ -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 \