Added x86_64-*-solaris to the list of supported platforms. This fixes

PR 37890.

2 files changed, 18 insertions, 10 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 8d838c4e2fb..f1cf66d7ce8 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2008/01/23 20:42:25 adam Exp $
+$NetBSD: distinfo,v 1.42 2008/01/29 01:05:13 rillig Exp $
 
 SHA1 (ocaml-3.10.1.tar.bz2) = 908176ff481fd6ce3ab89a96a76d9b3d7ca8c105
 RMD160 (ocaml-3.10.1.tar.bz2) = bf5bc105aece26df6460204d5a04e90c0d90d1cb
@@ -11,7 +11,7 @@ SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
 SHA1 (patch-aj) = 61b977596cbaf8e16a66bfdbe8a7ca1701073fa7
 SHA1 (patch-an) = 7a56338a19015b407cbfa8a328655e2bd035f8bf
-SHA1 (patch-at) = 4ce7a79f0c418ffe662401e7bd0bb0b150ee5e8f
+SHA1 (patch-at) = 44621cbca344a77ab8c0ffe418bc465ab6970380
 SHA1 (patch-au) = 2696bc59b08a0ef06157b77665588bcf26feb306
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
 SHA1 (patch-aw) = 5838ca13ba0f5d9328b9bb2135604f72e7d8b87b
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index a01a1d4cd91..859526daf5f 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
+$NetBSD: patch-at,v 1.16 2008/01/29 01:05:13 rillig Exp $
 
 --- configure.orig	2008-01-04 14:26:38.000000000 +0100
-+++ configure
++++ configure	2008-01-29 02:03:30.000000000 +0100
 @@ -488,7 +488,7 @@ mksharedlibrpath=''
  
  if test $withsharedlibs = "yes"; then
@@ -31,7 +31,15 @@ $NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
    i[3456]86-*-darwin*)          arch=i386; system=macosx;;
    i[3456]86-*-gnu*)             arch=i386; system=gnu;;
    mips-*-irix6*)                arch=mips; system=irix;;
-@@ -691,6 +693,7 @@ case "$arch,$model,$system" in
+@@ -604,6 +606,7 @@ case "$host" in
+   x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
+   x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
+   x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
++  x86_64-*-solaris*)            arch=amd64; system=solaris;;
+ esac
+ 
+ # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
+@@ -691,6 +694,7 @@ case "$arch,$model,$system" in
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,*,linux) profiling='prof';;
    amd64,*,gnu) profiling='prof';;
@@ -39,7 +47,7 @@ $NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
    *) profiling='noprof';;
  esac
  
-@@ -1081,6 +1084,8 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1081,6 +1085,8 @@ if test "$pthread_wanted" = "yes"; then
                     pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
      *-*-freebsd*)  pthread_link="-pthread"
                     pthread_caml_link="-cclib -pthread";;
@@ -48,7 +56,7 @@ $NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
      *-*-openbsd*)  pthread_link="-pthread"
                     pthread_caml_link="-cclib -pthread";;
      *)             pthread_link="-lpthread"
-@@ -1132,6 +1137,7 @@ fi
+@@ -1132,6 +1138,7 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -56,7 +64,7 @@ $NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
  for dir in \
      $x11_include_dir          \
                                \
-@@ -1178,6 +1184,7 @@ do
+@@ -1178,6 +1185,7 @@ do
      break
    fi
  done
@@ -64,7 +72,7 @@ $NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
  
  if test "$x11_include" = "not found"; then
    x11_try_lib_dir=''
-@@ -1269,31 +1276,8 @@ dbm_include="not found"
+@@ -1269,31 +1277,8 @@ dbm_include="not found"
  dbm_link="not found"
  use_gdbm_ndbm=no
  
@@ -98,7 +106,7 @@ $NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
  if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
    echo "NDBM not found, the \"dbm\" library will not be supported."
  else
-@@ -1303,8 +1287,8 @@ else
+@@ -1303,8 +1288,8 @@ else
    else
      dbm_include="-I$dbm_include"
    fi