Updates for ocaml: make 4.12.0 actually work

[Jaap Boender <jaapb%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%NetBSD.org@localhost>
Pushed By:	jaapb
Date:		Sun Jun 27 09:22:09 2021 +0200
Changeset:	65ecd37de12944fc301897f549f976afd695fa04

Modified Files:
	ocaml/distinfo
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-configure
	ocaml/patches/patch-lex_Makefile
	ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
Added Files:
	ocaml/patches/patch-otherlibs_unix_Makefile

Log Message:
Updates for ocaml: make 4.12.0 actually work

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=65ecd37de12944fc301897f549f976afd695fa04

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

diffstat:
 ocaml/distinfo                                          | 16 +++++++++-------
 ocaml/patches/patch-Makefile                            |  2 +-
 ocaml/patches/patch-configure                           |  2 +-
 ocaml/patches/patch-lex_Makefile                        |  2 +-
 ocaml/patches/patch-otherlibs_Makefile.otherlibs.common |  2 +-
 ocaml/patches/patch-otherlibs_unix_Makefile             | 15 +++++++++++++++
 6 files changed, 28 insertions(+), 11 deletions(-)

diffs:
diff --git a/ocaml/distinfo b/ocaml/distinfo
index 922ed25014..7947ef051a 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.142 2021/03/08 08:08:43 jaapb Exp $
+$NetBSD: distinfo,v 1.139 2020/12/10 21:37:07 wiz Exp $
 
-SHA1 (ocaml-4.12.0.tar.gz) = 6aee5658204c68042fbc8ef993c28475998a97f6
-RMD160 (ocaml-4.12.0.tar.gz) = 92711b958b528fff842313deef68596dce2f02b5
-SHA512 (ocaml-4.12.0.tar.gz) = 7c9e4ebe9c6e3f04eca9b837b70f3dcfda7d81d033f4fb6d0c507cd40c82115c0dde0907444f60c406a301fafe1a48d0bca01ee6af192fd08458d3b1bee7f717
-Size (ocaml-4.12.0.tar.gz) = 5075034 bytes
-SHA1 (patch-Makefile) = 8bf66264a8c4c28884a171eb19ed7ea8d8af8051
-SHA1 (patch-Makefile.build_config.in) = 18703cddafff3d0f2f2ee12cbb2cd1600d755d6e
+SHA1 (ocaml-4.12.0~alpha2.tar.gz) = 48748180b87f5cba3bb5e2c00c3167a13ae320d1
+RMD160 (ocaml-4.12.0~alpha2.tar.gz) = 99d505156e72e1e3e397d6a5fc48c590dad91921
+SHA512 (ocaml-4.12.0~alpha2.tar.gz) = 26ac762186563afe19f7edcb96963193de26701d8690a17b6b7cff4c6e816b32502c5ac8e9be7068d78ddae4deda85c21f6a9cd0eef5c2d2056195d2f7c61cd8
+Size (ocaml-4.12.0~alpha2.tar.gz) = 5044907 bytes
+SHA1 (patch-Makefile) = bd0451b5240b087c98747d13f9884d30722a91a8
+SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
+SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
 SHA1 (patch-configure) = 32b499d2acbd3075762fa578be1cad74bbcd2817
 SHA1 (patch-lex_Makefile) = b549f0913f4ee1d86df977c2a3bb7d8f887915d4
@@ -15,6 +16,7 @@ SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb573
 SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 6ad7b42f06ef86e4a88440bfd16e1ff0fc4b3556
 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-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
 SHA1 (patch-tools_Makefile) = 69f92a8615ed6f9b33f27546c6a25a1f24995e55
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index 6ec32f6dc8..5076196acf 100644
--- a/ocaml/patches/patch-Makefile
+++ b/ocaml/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-Makefile,v 1.16 2020/12/09 10:33:04 jaapb Exp $
 
 Use BSD_INSTALL_* instead of mkdir
 Honor LDFLAGS
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index 9bddab33f5..8c12131781 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-configure,v 1.43 2020/12/09 10:33:04 jaapb Exp $
 
 All kinds of OS-specific changes to configure
 Honor LDFLAGS.
diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
index d4a5f1c384..1197e7bb05 100644
--- a/ocaml/patches/patch-lex_Makefile
+++ b/ocaml/patches/patch-lex_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-lex_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
diff --git a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
index 0f05decfbc..ced17451e8 100644
--- a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
+++ b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-otherlibs_Makefile.otherlibs.common,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
diff --git a/ocaml/patches/patch-otherlibs_unix_Makefile b/ocaml/patches/patch-otherlibs_unix_Makefile
new file mode 100644
index 0000000000..c8b9c06521
--- /dev/null
+++ b/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 \