CVS commit: pkgsrc/lang/ocaml

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan  8 12:28:16 UTC 2021

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

Log Message:
ocaml: Fix previous correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    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.140 pkgsrc/lang/ocaml/distinfo:1.141
--- pkgsrc/lang/ocaml/distinfo:1.140    Mon Jan  4 07:58:55 2021
+++ pkgsrc/lang/ocaml/distinfo  Fri Jan  8 12:28:16 2021
@@ -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) 
 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

Index: pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile:1.2 pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile:1.3
--- pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile:1.2 Mon Jan  4 07:58:55 2021
+++ pkgsrc/lang/ocaml/patches/patch-otherlibs_unix_Makefile     Fri Jan  8 12:28:16 2021
@@ -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 \