More RELRO work

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

Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%kerguelen.org@localhost>
Pushed By:	jaapb
Date:		Mon May 6 16:13:57 2019 +0100
Changeset:	3b9dc699ac7254faa1cc5025f663f1fde1f6ecb9

Modified Files:
	ocaml/PLIST
	ocaml/distinfo
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-runtime_Makefile

Log Message:
More RELRO work

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

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

diffstat:
 ocaml/PLIST                          |  2 ++
 ocaml/distinfo                       |  4 ++--
 ocaml/patches/patch-Makefile         |  4 ++--
 ocaml/patches/patch-runtime_Makefile | 24 +++++++++++++++++++++---
 4 files changed, 27 insertions(+), 7 deletions(-)

diffs:
diff --git a/ocaml/PLIST b/ocaml/PLIST
index 2406c3841c..9e37c08647 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -1419,6 +1419,8 @@ lib/ocaml/ld.conf
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
 ${PLIST.ocaml-opt}lib/ocaml/libasmrun.a
+${PLIST.ocaml-opt}lib/ocaml/libasmrun_pic.a
+${PLIST.ocaml-opt}lib/ocaml/libasmrun_shared.so
 ${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
 ${PLIST.instrumented_runtime}${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
diff --git a/ocaml/distinfo b/ocaml/distinfo
index 89d0b6a20d..46b465e834 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -4,7 +4,7 @@ SHA1 (ocaml-4.08.0+beta3.tar.gz) = b5976a66e42f0d2a6a6379b71bf488aa50e36fc3
 RMD160 (ocaml-4.08.0+beta3.tar.gz) = 4b151e8e32d0a940254a52a1101662fa05f1892f
 SHA512 (ocaml-4.08.0+beta3.tar.gz) = b68cd6af7d48b4134e79d3646315c2ae613afd77b4eaac33e725addf568f61bafd6063997ef158373c279a90f8a31a5ce708f87a3272a13986447addce71a3cb
 Size (ocaml-4.08.0+beta3.tar.gz) = 4902188 bytes
-SHA1 (patch-Makefile) = 34150bb2534632de9b91cf8c84c476cc9d5d7886
+SHA1 (patch-Makefile) = 5540fa654349931a9796d97ad71ecdff90a60e91
 SHA1 (patch-Makefile.common.in) = 419b838a31898fffdbe5dc785ee7c602b48343ca
 SHA1 (patch-asmcomp_amd64_emit.mlp) = 68cc42afd6439347524f2d81c48305dcbc173869
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
@@ -22,7 +22,7 @@ SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb573
 SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 9933ed1b10c79885920020c444750f7487829d6b
 SHA1 (patch-otherlibs_systhreads_Makefile) = 477f965a6d8854dcf33caecb91d6655896333950
 SHA1 (patch-otherlibs_threads_Makefile) = 607e5ae77c526ea412452b93454d2e0d65aed687
-SHA1 (patch-runtime_Makefile) = 08199b04abfbe4a60afcd776d1bb19b4e60b94e7
+SHA1 (patch-runtime_Makefile) = 45c05f2276c67fb77ef19738e7be5ecc4ceb7558
 SHA1 (patch-tools_Makefile) = 8685b49a46b6a9337b621e94699dca43c6ba291a
 SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
 SHA1 (patch-tools_ocamlmklib) = 409e9fab682d9c0533725b872fd233becf234133
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index 3400268fb3..83a6708f76 100644
--- a/ocaml/patches/patch-Makefile
+++ b/ocaml/patches/patch-Makefile
@@ -1,9 +1,9 @@
 $NetBSD$
 
---- Makefile.orig	2019-03-01 15:13:45.000000000 +0000
+--- Makefile.orig	2019-04-18 10:10:54.000000000 +0000
 +++ Makefile
 @@ -54,7 +54,7 @@ INCLUDES=-I utils -I parsing -I typing -
- COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-41-42-44-45-48-66 \
+ COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \
  	  -warn-error A \
            -bin-annot -safe-string -strict-formats $(INCLUDES)
 -LINKFLAGS=
diff --git a/ocaml/patches/patch-runtime_Makefile b/ocaml/patches/patch-runtime_Makefile
index 61217031ce..373707e8ca 100644
--- a/ocaml/patches/patch-runtime_Makefile
+++ b/ocaml/patches/patch-runtime_Makefile
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- runtime/Makefile.orig	2019-03-01 15:13:46.000000000 +0000
+--- runtime/Makefile.orig	2019-04-18 10:10:54.000000000 +0000
 +++ runtime/Makefile
-@@ -184,11 +184,11 @@ LIBS = $(BYTECCLIBS) $(EXTRALIBS)
+@@ -182,11 +182,11 @@ LIBS = $(BYTECCLIBS) $(EXTRALIBS)
  ifdef BOOTSTRAPPING_FLEXLINK
  MAKE_OCAMLRUN=$(MKEXE_BOOT)
  else
@@ -16,7 +16,7 @@ $NetBSD$
  endif
  
  # Build, install and clean targets
-@@ -294,13 +294,13 @@ libcamlrun.$(A): $(libcamlrun_OBJECTS)
+@@ -292,13 +292,13 @@ libcamlrun.$(A): $(libcamlrun_OBJECTS)
  	$(call MKLIB,$@, $^)
  
  ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
@@ -32,3 +32,21 @@ $NetBSD$
  
  libcamlruni.$(A): $(libcamlruni_OBJECTS)
  	$(call MKLIB,$@, $^)
+@@ -307,7 +307,7 @@ libcamlrun_pic.$(A): $(libcamlrunpic_OBJ
+ 	$(call MKLIB,$@, $^)
+ 
+ libcamlrun_shared.$(SO): $(libcamlrunpic_OBJECTS)
+-	$(MKDLL) -o $@ $^ $(BYTECCLIBS)
++	$(MKDLL) $(LDFLAGS) -o $@ $^ $(BYTECCLIBS)
+ 
+ libasmrun.$(A): $(libasmrun_OBJECTS)
+ 	$(call MKLIB,$@, $^)
+@@ -325,7 +325,7 @@ libasmrun_pic.$(A): $(libasmrunpic_OBJEC
+ 	$(call MKLIB,$@, $^)
+ 
+ libasmrun_shared.$(SO): $(libasmrunpic_OBJECTS)
+-	$(MKDLL) -o $@ $^ $(NATIVECCLIBS)
++	$(MKDLL) $(LDFLAGS) -o $@ $^ $(NATIVECCLIBS)
+ 
+ # Target-specific preprocessor and compiler flags
+