ocaml: Restore SunOS patches.

2 files changed, 37 insertions, 16 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 6e08180e422..094c9fe3a76 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.115 2018/01/10 14:30:34 jaapb Exp $
+$NetBSD: distinfo,v 1.116 2018/01/15 12:56:08 jperkin Exp $
 
 SHA1 (ocaml-4.06.0.tar.gz) = bcfe5895acc88d63635d77bf0bdb8817a947a134
 RMD160 (ocaml-4.06.0.tar.gz) = fc284c392b1dd072f2c5bc7c73d0149e858ec405
@@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = 7fb492bbc3c44bad1753b8fc6928b7b0cadac436
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
 SHA1 (patch-byterun_Makefile) = 02797b10d685b25c0c6f5aab8eadc324e26826e9
-SHA1 (patch-configure) = c680a03e0914c7eb2bf1987226684463d75e0633
+SHA1 (patch-configure) = 981084745d977f802fc77af1b431593e2a761286
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
 SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index fead0f1a59c..0fb8b44dde4 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.28 2018/01/10 14:30:35 jaapb Exp $
+$NetBSD: patch-configure,v 1.29 2018/01/15 12:56:08 jperkin Exp $
 
 All kinds of OS-specific changes to configure
 --- configure.orig	2017-11-03 13:52:13.000000000 +0000
@@ -12,7 +12,19 @@ All kinds of OS-specific changes to configure
  
  if $with_sharedlibs; then
    case "$target" in
-@@ -850,7 +850,7 @@ if $with_sharedlibs; then
+@@ -823,7 +823,10 @@ if $with_sharedlibs; then
+         *gcc*)
+           sharedcccompopts="-fPIC"
+           if sh ./solaris-ld; then
+-            mksharedlib="ld -G"
++            case "$target" in
++            x86_64*) mksharedlib="$cc -shared" ;;
++            *)       mksharedlib="$cc -G" ;;
++            esac
+             rpath="-R"
+             mksharedlibrpath="-R"
+           else
+@@ -850,7 +853,7 @@ if $with_sharedlibs; then
        rpath="-Wl,-rpath,"
        mksharedlibrpath="-rpath "
        shared_libraries_supported=true;;
@@ -21,7 +33,7 @@ All kinds of OS-specific changes to configure
        mksharedlib="$cc -shared -flat_namespace -undefined suppress \
                     -read_only_relocs suppress"
        common_cflags="$dl_defs $common_cflags"
-@@ -899,11 +899,7 @@ if $with_sharedlibs; then
+@@ -899,11 +902,7 @@ if $with_sharedlibs; then
      i[3456]86-*-linux*)           natdynlink=true;;
      i[3456]86-*-gnu*)             natdynlink=true;;
      x86_64-*-linux*)              natdynlink=true;;
@@ -34,7 +46,7 @@ All kinds of OS-specific changes to configure
      x86_64-*-darwin*)             natdynlink=true;;
      s390x*-*-linux*)              natdynlink=true;;
      powerpc*-*-linux*)            natdynlink=true;;
-@@ -916,6 +912,9 @@ if $with_sharedlibs; then
+@@ -916,6 +915,9 @@ if $with_sharedlibs; then
      x86_64-*-openbsd*)            natdynlink=true;;
      i[3456]86-*-netbsd*)          natdynlink=true;;
      x86_64-*-netbsd*)             natdynlink=true;;
@@ -44,7 +56,7 @@ All kinds of OS-specific changes to configure
      i386-*-gnu0.3)                natdynlink=true;;
      i[3456]86-*-haiku*)           natdynlink=true;;
      arm*-*-linux*)                natdynlink=true;;
-@@ -951,6 +950,7 @@ system=unknown
+@@ -951,6 +953,7 @@ system=unknown
  case "$target" in
    i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
    i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
@@ -52,7 +64,7 @@ All kinds of OS-specific changes to configure
    i[3456]86-*-solaris*)         if $arch64; then
                                    arch=amd64; system=solaris
                                  else
-@@ -959,6 +959,7 @@ case "$target" in
+@@ -959,6 +962,7 @@ case "$target" in
    i[3456]86-*-haiku*)           arch=i386; system=beos;;
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
@@ -60,7 +72,7 @@ All kinds of OS-specific changes to configure
    i[3456]86-*-darwin*)          if $arch64; then
                                    arch=amd64; system=macosx
                                  else
-@@ -979,6 +980,8 @@ case "$target" in
+@@ -979,6 +983,8 @@ case "$target" in
    armv6t2*-*-linux-gnueabi)     arch=arm; model=armv6t2; system=linux_eabi;;
    armv6*-*-linux-gnueabi)       arch=arm; model=armv6; system=linux_eabi;;
    armv6*-*-freebsd*)            arch=arm; model=armv6; system=freebsd;;
@@ -69,7 +81,7 @@ All kinds of OS-specific changes to configure
    earmv6*-*-netbsd*)            arch=arm; model=armv6; system=netbsd;;
    earmv7*-*-netbsd*)            arch=arm; model=armv7; system=netbsd;;
    armv5te*-*-linux-gnueabi)     arch=arm; model=armv5te; system=linux_eabi;;
-@@ -996,6 +999,7 @@ case "$target" in
+@@ -996,6 +1002,7 @@ case "$target" in
    x86_64-*-mingw*)              arch=amd64; system=mingw;;
    aarch64-*-linux*)             arch=arm64; system=linux;;
    x86_64-*-cygwin*)             arch=amd64; system=cygwin;;
@@ -77,7 +89,15 @@ All kinds of OS-specific changes to configure
  esac
  
  # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
-@@ -1037,8 +1041,8 @@ case "$arch,$system" in
+@@ -1019,7 +1026,6 @@ nativeccprofopts=''
+ case "$arch,$cc,$system,$model" in
+   *,*,rhapsody,*)      if $arch64; then partialld="ld -r -arch ppc64"; fi;;
+   amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
+-  amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
+   power,gcc*,elf,ppc)   partialld="ld -r -m elf32ppclinux";;
+   power,gcc*,elf,ppc64)   partialld="ld -r -m elf64ppc";;
+   power,gcc*,elf,ppc64le)   partialld="ld -r -m elf64lppc";;
+@@ -1037,8 +1043,8 @@ case "$arch,$system" in
                      fi;;
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
@@ -88,15 +108,16 @@ All kinds of OS-specific changes to configure
    power,elf)      if $arch64; then
                      as="${TOOLPREF}as -a64 -mppc64"
                      aspp="${TOOLPREF}gcc -m64 -c"
-@@ -1086,6 +1090,7 @@ case "$arch,$system" in
+@@ -1086,6 +1092,8 @@ case "$arch,$system" in
    power,elf) profiling='true';;
    power,bsd*) profiling='true';;
    power,netbsd) profiling='true';;
++  amd64,solaris) profiling='true';;
 +  *,dragonfly) profiling='true';;
    *) profiling='false';;
  esac
  
-@@ -1669,6 +1674,8 @@ fi
+@@ -1669,6 +1677,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -105,7 +126,7 @@ All kinds of OS-specific changes to configure
  if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
    if pkg-config --exists x11 2>/dev/null; then
      x11_include=`pkg-config --cflags x11`
-@@ -1715,6 +1722,7 @@ if test "$x11_include" = "not found"; th
+@@ -1715,6 +1725,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -113,7 +134,7 @@ All kinds of OS-specific changes to configure
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1772,6 +1780,7 @@ if test "$x11_include" = "not found"; th
+@@ -1772,6 +1783,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -121,7 +142,7 @@ All kinds of OS-specific changes to configure
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1793,19 +1802,16 @@ if test "$x11_include" = "not found"; th
+@@ -1793,19 +1805,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else