CVS commit: pkgsrc/lang/ocaml

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 22 10:22:30 UTC 2018

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

Log Message:
ocaml: Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/ocaml/patches/patch-configure

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.116 pkgsrc/lang/ocaml/distinfo:1.117
--- pkgsrc/lang/ocaml/distinfo:1.116    Mon Jan 15 12:56:08 2018
+++ pkgsrc/lang/ocaml/distinfo  Mon Jan 22 10:22:30 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.116 2018/01/15 12:56:08 jperkin Exp $
+$NetBSD: distinfo,v 1.117 2018/01/22 10:22:30 wiz Exp $
 
 SHA1 (ocaml-4.06.0.tar.gz) = bcfe5895acc88d63635d77bf0bdb8817a947a134
 RMD160 (ocaml-4.06.0.tar.gz) = fc284c392b1dd072f2c5bc7c73d0149e858ec405
@@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = 7fb492bbc3c44bad
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
 SHA1 (patch-byterun_Makefile) = 02797b10d685b25c0c6f5aab8eadc324e26826e9
-SHA1 (patch-configure) = 981084745d977f802fc77af1b431593e2a761286
+SHA1 (patch-configure) = 2bd3237bd5b7a5c3baafb90f86cbfb8c0b487c67
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
 SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04

Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.29 pkgsrc/lang/ocaml/patches/patch-configure:1.30
--- pkgsrc/lang/ocaml/patches/patch-configure:1.29      Mon Jan 15 12:56:08 2018
+++ pkgsrc/lang/ocaml/patches/patch-configure   Mon Jan 22 10:22:30 2018
@@ -1,6 +1,8 @@
-$NetBSD: patch-configure,v 1.29 2018/01/15 12:56:08 jperkin Exp $
+$NetBSD: patch-configure,v 1.30 2018/01/22 10:22:30 wiz Exp $
 
 All kinds of OS-specific changes to configure
+Honor LDFLAGS.
+
 --- configure.orig     2017-11-03 13:52:13.000000000 +0000
 +++ configure
 @@ -791,7 +791,7 @@ sharedcccompopts=''
@@ -166,3 +168,12 @@ All kinds of OS-specific changes to conf
  if test "x11_include" != "not found"; then
    if test "$x11_include" = "-I/usr/include"; then
      x11_include=""
+@@ -2056,7 +2065,7 @@ config CFLAGS "$common_cflags $internal_
+ config CPPFLAGS "$common_cppflags $internal_cppflags"
+ config OCAMLC_CFLAGS "$common_cflags $sharedcccompopts"
+ config OCAMLC_CPPFLAGS "$common_cppflags"
+-config LDFLAGS "$ldflags"
++config LDFLAGS "$ldflags $LDFLAGS"
+ config BYTECCLIBS "$cclibs $dllib $curseslibs $pthread_link \
+                  $instrumented_runtime_libs"
+ config RPATH "$rpath"