Support -Wl,-z in ocamlmklib. Needed for RELRO support e.g. in ocaml-lablgtk.

Bump PKGREVISION.

3 files changed, 18 insertions, 9 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index d07fcf5c6bf..8c55c4da496 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2017/07/17 23:26:23 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2017/07/18 17:41:04 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 CONFIGURE_ENV+=		disable_x11=yes
 
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 041f71655d6..1d9ffe9951e 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.107 2017/07/17 23:26:23 wiz Exp $
+$NetBSD: distinfo,v 1.108 2017/07/18 17:41:04 wiz Exp $
 
 SHA1 (ocaml-4.04.2.tar.gz) = 24281675ea90c9234e323d556f1d4cd7bdab8ec1
 RMD160 (ocaml-4.04.2.tar.gz) = 3d8f78cd544815233f814a0e24eba8d3c948b190
@@ -29,7 +29,7 @@ SHA1 (patch-stdlib_Makefile.shared) = dac87da3b0461a2c816b862af3a0c0bdf740b749
 SHA1 (patch-testsuite_tests_tool-ocamldoc-man_Makefile) = 41c7d6ffa98ed4f4fe261d6ed890be045c55adaf
 SHA1 (patch-tools_Makefile.shared) = 517137929c9941df305f7f14ba5f17ec9e012822
 SHA1 (patch-tools_ocamlcp.ml) = 299c84c169bacfe0315a986d739b3e61d2491289
-SHA1 (patch-tools_ocamlmklib) = 49ea077e3f77527336548ae6515d135461b83080
+SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d
 SHA1 (patch-tools_ocamloptp.ml) = bb6ba38e9bb260117d67491566474fda750d708b
 SHA1 (patch-utils_clflags.ml) = d16832fedb5db08d035f1661eaf9c3b48411bc69
 SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995
diff --git a/lang/ocaml/patches/patch-tools_ocamlmklib b/lang/ocaml/patches/patch-tools_ocamlmklib
index fe3aebc87b9..3b51416e395 100644
--- a/lang/ocaml/patches/patch-tools_ocamlmklib
+++ b/lang/ocaml/patches/patch-tools_ocamlmklib
@@ -1,8 +1,8 @@
-$NetBSD: patch-tools_ocamlmklib,v 1.6 2016/05/05 08:12:01 jaapb Exp $
+$NetBSD: patch-tools_ocamlmklib,v 1.7 2017/07/18 17:41:04 wiz Exp $
 
 Add ELF mode support to ocamlmklib
 
---- tools/ocamlmklib.ml.orig	2016-04-01 12:53:41.000000000 +0000
+--- tools/ocamlmklib.ml.orig	2017-06-23 15:13:40.000000000 +0000
 +++ tools/ocamlmklib.ml
 @@ -28,6 +28,7 @@ and c_objs = ref []         (* .o, .a, .
  and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
@@ -12,7 +12,16 @@ Add ELF mode support to ocamlmklib
  and failsafe = ref false    (* whether to fall back on static build only *)
  and c_libs = ref []         (* libs to pass to mksharedlib and ocamlc -cclib *)
  and c_Lopts = ref []      (* options to pass to mksharedlib and ocamlc -cclib *)
-@@ -104,8 +105,9 @@ let parse_arguments argv =
+@@ -84,6 +85,8 @@ let parse_arguments argv =
+       c_objs := s :: !c_objs
+     else if s = "-cclib" then
+       caml_libs := next_arg () :: "-cclib" :: !caml_libs
++    else if starts_with s "-Wl,-z" then
++      c_libs := s :: !c_libs
+     else if s = "-ccopt" then
+       caml_opts := next_arg () :: "-ccopt" :: !caml_opts
+     else if s = "-custom" then
+@@ -104,8 +107,9 @@ let parse_arguments argv =
        c_libs := s :: !c_libs
      else if starts_with s "-L" then
       (c_Lopts := s :: !c_Lopts;
@@ -24,7 +33,7 @@ Add ELF mode support to ocamlmklib
      else if s = "-ocamlcflags" then
        ocamlc_opts := next_arg () :: !ocamlc_opts
      else if s = "-ocamlc" then
-@@ -120,6 +122,8 @@ let parse_arguments argv =
+@@ -120,6 +124,8 @@ let parse_arguments argv =
        output_c := next_arg()
      else if s = "-dllpath" || s = "-R" || s = "-rpath" then
        rpath := next_arg() :: !rpath
@@ -33,7 +42,7 @@ Add ELF mode support to ocamlmklib
      else if starts_with s "-R" then
        rpath := chop_prefix s "-R" :: !rpath
      else if s = "-Wl,-rpath" then
-@@ -165,6 +169,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
+@@ -165,6 +171,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
  \n  -custom        Disable dynamic loading\
  \n  -g             Build with debug information\
  \n  -dllpath <dir> Add <dir> to the run-time search path for DLLs\