Restore x86_64-*-solaris support lost in previous update.

2 files changed, 18 insertions, 10 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index f409b919053..8cb104b7a2d 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.101 2016/12/30 11:15:00 jaapb Exp $
+$NetBSD: distinfo,v 1.102 2017/03/23 18:22:34 jperkin Exp $
 
 SHA1 (ocaml-4.04.0.tar.gz) = 49c4d406f5eb4dc2d8ac006103f2bc459fa5a5a6
 RMD160 (ocaml-4.04.0.tar.gz) = 98cbfac14cf93983ae62bfa2042058d0af1734bd
@@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = 426d2aa080922fb6f034a76b8009f2fcbbe7a693
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c
 SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1
-SHA1 (patch-configure) = 931f226df38ca647421c5ae0dbe00743797e69ee
+SHA1 (patch-configure) = ffe90a8b28bcccbdeb11882fe7920110785d1084
 SHA1 (patch-debugger_Makefile.shared) = f0aac2e10b7ccf2e8e43bbbd3fd3e59e4dc4eeae
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index b710477b622..a9913945f80 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.20 2016/12/30 11:15:00 jaapb Exp $
+$NetBSD: patch-configure,v 1.21 2017/03/23 18:22:34 jperkin Exp $
 
 All kinds of OS-specific changes to configure
 --- configure.orig	2016-11-04 16:08:24.000000000 +0000
@@ -63,7 +63,15 @@ All kinds of OS-specific changes to configure
    i[3456]86-*-darwin*)          if $arch64; then
                                    arch=amd64; system=macosx
                                  else
-@@ -923,7 +927,6 @@ case "$arch,$nativecc,$system,$model" in
+@@ -888,6 +892,7 @@ case "$target" in
+   x86_64-*-mingw*)              arch=amd64; system=mingw;;
+   aarch64-*-linux*)             arch=arm64; system=linux;;
+   x86_64-*-cygwin*)             arch=amd64; system=cygwin;;
++  x86_64-*-solaris*)            arch=amd64; system=solaris;;
+ esac
+ 
+ # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
+@@ -923,7 +928,6 @@ case "$arch,$nativecc,$system,$model" in
    *,*,nextstep,*)      nativecclinkopts="-posix";;
    *,*,rhapsody,*)      if $arch64; then partialld="ld -r -arch ppc64"; fi;;
    amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
@@ -71,7 +79,7 @@ All kinds of OS-specific changes to configure
    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";;
-@@ -941,8 +944,8 @@ case "$arch,$system" in
+@@ -941,8 +945,8 @@ case "$arch,$system" in
                      fi;;
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
@@ -82,7 +90,7 @@ All kinds of OS-specific changes to configure
    power,elf)      if $arch64; then
                      as="${TOOLPREF}as -a64 -mppc64"
                      aspp="${TOOLPREF}gcc -m64 -c"
-@@ -991,6 +994,7 @@ case "$arch,$system" in
+@@ -991,6 +995,7 @@ case "$arch,$system" in
    arm,linux*) profiling='prof';;
    power,elf) profiling='prof';;
    power,bsd*) profiling='prof';;
@@ -90,7 +98,7 @@ All kinds of OS-specific changes to configure
    *) profiling='noprof';;
  esac
  
-@@ -1554,6 +1558,8 @@ fi
+@@ -1554,6 +1559,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -99,7 +107,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`
-@@ -1600,6 +1606,7 @@ if test "$x11_include" = "not found"; th
+@@ -1600,6 +1607,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -107,7 +115,7 @@ All kinds of OS-specific changes to configure
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1657,6 +1664,7 @@ if test "$x11_include" = "not found"; th
+@@ -1657,6 +1665,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -115,7 +123,7 @@ All kinds of OS-specific changes to configure
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1678,19 +1686,16 @@ if test "$x11_include" = "not found"; th
+@@ -1678,19 +1687,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else