ocaml: revert part of powerpc patches

Do not overwrite cc linker options (probably committed unintentionally).
Refixes RELRO build.

2 files changed, 5 insertions, 23 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index d7664815d50..32e63f6a21f 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.111 2017/10/10 12:10:05 he Exp $
+$NetBSD: distinfo,v 1.112 2017/10/17 08:26:48 wiz Exp $
 
 SHA1 (ocaml-4.05.0.tar.gz) = ef9e3febed311cf9331baefd2999961b36f849cb
 RMD160 (ocaml-4.05.0.tar.gz) = 67b299c3abe032f955e95eac106c32664351453c
@@ -9,7 +9,7 @@ SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
 SHA1 (patch-asmrun_signals__osdep.h) = fa0c6981ca08d1114a377df1720ad866b94eff43
 SHA1 (patch-byterun_Makefile) = 28b8298093a439fe1418dc91bb8a06da9870bfab
-SHA1 (patch-configure) = 8c515cc9fada57bce81134c02b8763a13b9d4445
+SHA1 (patch-configure) = 7022f94813bbb49d4e4d87228b4de19b28065c1a
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
 SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
@@ -26,9 +26,9 @@ SHA1 (patch-otherlibs_threads_Makefile) = b25c0003a4e4304b6751ec90bdb99aae7a24cf
 SHA1 (patch-stdlib_Makefile) = 4832d06bf0d0873ddf814e77f6085a2acf2b8988
 SHA1 (patch-testsuite_tests_lib-dynlink-native_Makefile) = aad24bed515295fe0262ab09d015f3afbe2f3bc4
 SHA1 (patch-testsuite_tests_tool-ocamldoc-man_Makefile) = 670c9ecc83ae3b83c2232f9f182ccd21624bfed0
-SHA1 (patch-tools_ocamlcp.ml) = 299c84c169bacfe0315a986d739b3e61d2491289
+SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
 SHA1 (patch-tools_ocamlmklib) = 53785aa5f0684a2c8708891d7e4e9d4400afbe7d
-SHA1 (patch-tools_ocamloptp.ml) = bb6ba38e9bb260117d67491566474fda750d708b
+SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a
 SHA1 (patch-utils_clflags.ml) = d16832fedb5db08d035f1661eaf9c3b48411bc69
 SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995
 SHA1 (patch-yacc_Makefile) = e7e77becbc1872fedd37bdeb4614739eb67977c8
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 4b632a69bb7..c9c097127d8 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,18 +1,9 @@
-$NetBSD: patch-configure,v 1.25 2017/10/10 12:10:05 he Exp $
+$NetBSD: patch-configure,v 1.26 2017/10/17 08:26:48 wiz Exp $
 
 All kinds of OS-specific changes to configure
 
 --- configure.orig	2017-07-13 08:56:44.000000000 +0000
 +++ configure
-@@ -359,7 +359,7 @@ mkexe="\$(BYTECC)"
- mkexedebugflag="-g"
- bytecccompopts=""
- byteccprivatecompopts=""
--bytecclinkopts=""
-+bytecclinkopts="   -L/usr/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib"
- ostype="Unix"
- exe=""
- iflexdir=""
 @@ -764,7 +764,10 @@ if test $with_sharedlibs = "yes"; then
          *gcc*)
            sharedcccompopts="-fPIC"
@@ -90,15 +81,6 @@ All kinds of OS-specific changes to configure
  esac
  
  # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -974,7 +979,7 @@ fi
- nativecccompopts="$bytecccompopts"
- nativeccprivatecompopts="$byteccprivatecompopts"
- nativeccprofopts=''
--nativecclinkopts=''
-+nativecclinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib"
- # FIXME the naming of nativecclinkopts is broken: these are options for
- # ld (for shared libs), not for cc
- nativeccrpath="$byteccrpath"
 @@ -983,7 +988,6 @@ case "$arch,$nativecc,$system,$model" in
    *,*,nextstep,*)      nativecclinkopts="-posix";;
    *,*,rhapsody,*)      if $arch64; then partialld="ld -r -arch ppc64"; fi;;