Detect 64-bit SunOS.

2 files changed, 13 insertions, 11 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index a2afc1953df..db30290fb72 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2015/03/14 15:17:14 gdt Exp $
+$NetBSD: distinfo,v 1.82 2015/03/17 14:14:43 jperkin Exp $
 
 SHA1 (ocaml-4.02.1.tar.gz) = 6af8c67f2badece81d8e1d1ce70568a16e42313e
 RMD160 (ocaml-4.02.1.tar.gz) = fcb30200e9675d92e402b4b7101a032f918f80c1
@@ -13,7 +13,7 @@ SHA1 (patch-asmrun_signals_osdep.h) = 0ff83333dd75ecfe8f262b7523231832169986a7
 SHA1 (patch-byterun_Makefile) = 2b88b35e5ffcccc315542cb814b9e826126acb54
 SHA1 (patch-config_auto__aux_gethostbyaddr.c) = ce724831e93081d3e51a122fef14b17543c3221c
 SHA1 (patch-config_auto__aux_gethostbyname.c) = f05a6026a18ca7557558383103c6a2fc08caee28
-SHA1 (patch-configure) = 546e422e15087be02001c20e6cf582fc6017564a
+SHA1 (patch-configure) = 58669c040539b40cd2ec5b3f110e5239eea284da
 SHA1 (patch-debugger_Makefile.shared) = 9acaa17f22a66311859b6ac4a0c047e6693fce33
 SHA1 (patch-driver_compenv.ml) = cb6197cee99ab77fd1b8aadca7cef613c0e35a31
 SHA1 (patch-driver_main.ml) = ed7a63d0678214efed7871b41575c34464c7272a
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 8f7f9f144e2..485a18d8951 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure,v 1.9 2015/01/20 14:12:25 jaapb Exp $
+$NetBSD: patch-configure,v 1.10 2015/03/17 14:14:43 jperkin Exp $
 
 Several configure changes to work on and detect NetBSD (and some other OSes)
+
 --- configure.orig	2014-10-03 19:25:46.000000000 +0000
 +++ configure
 @@ -318,11 +318,11 @@ TOOLCHAIN="cc"
@@ -127,15 +128,16 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    armv6*-*-linux-gnueabihf)     arch=arm; model=armv6; system=linux_eabihf;;
    arm*-*-linux-gnueabihf)       arch=arm; system=linux_eabihf;;
    armv7*-*-linux-gnueabi)       arch=arm; model=armv7; system=linux_eabi;;
-@@ -835,6 +840,7 @@ case "$target" in
+@@ -835,6 +840,8 @@ case "$target" in
    x86_64-*-gnu*)                arch=amd64; system=gnu;;
    x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
    x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
 +  x86_64-*-dragonfly*)          arch=amd64; system=dragonfly;;
++  x86_64-*-solaris*)            arch=amd64; system=solaris;;
    x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
    x86_64-*-darwin*)             arch=amd64; system=macosx;;
    x86_64-*-mingw*)              arch=amd64; system=mingw;;
-@@ -874,7 +880,7 @@ case "$arch,$nativecc,$system,$target" i
+@@ -874,7 +881,7 @@ case "$arch,$nativecc,$system,$target" i
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;
    *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
    amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
@@ -144,7 +146,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
  esac
  
-@@ -891,7 +897,7 @@ case "$arch,$system" in
+@@ -891,7 +898,7 @@ case "$arch,$system" in
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
    i386,solaris)   as="${TOOLPREF}as"
@@ -153,7 +155,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    power,elf)      as="${TOOLPREF}as -u -m ppc"
                    aspp="${TOOLPREF}gcc -c";;
    power,rhapsody) as="${TOOLPREF}as -arch $model"
-@@ -930,6 +936,7 @@ case "$arch,$system" in
+@@ -930,6 +937,7 @@ case "$arch,$system" in
    arm,linux*) profiling='prof';;
    power,elf) profiling='prof';;
    power,bsd*) profiling='prof';;
@@ -161,7 +163,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *) profiling='noprof';;
  esac
  
-@@ -1434,6 +1441,8 @@ fi
+@@ -1434,6 +1442,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -170,7 +172,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
  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`
-@@ -1480,6 +1489,7 @@ if test "$x11_include" = "not found"; th
+@@ -1480,6 +1490,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -178,7 +180,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1537,6 +1547,7 @@ if test "$x11_include" = "not found"; th
+@@ -1537,6 +1548,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -186,7 +188,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1558,18 +1569,16 @@ if test "$x11_include" = "not found"; th
+@@ -1558,18 +1570,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else