Don't use GNU ld flags on x86_64 SunOS. Fixes various dependencies.

Bump PKGREVISION.

3 files changed, 20 insertions, 12 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 19415e7285e..7baa5f15141 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2016/07/07 12:15:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.105 2016/07/13 15:01:42 jperkin Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 #CONFIGURE_ARGS+=	-no-tk
 #CONFIGURE_ARGS+=	-cc ${CC}
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 833a05da477..d547d62d9ed 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.97 2016/07/13 13:36:01 jperkin Exp $
+$NetBSD: distinfo,v 1.98 2016/07/13 15:01:42 jperkin Exp $
 
 SHA1 (ocaml-4.03.0.tar.gz) = 28773fd89507dbc400a366b886425436569e70d8
 RMD160 (ocaml-4.03.0.tar.gz) = 774934e72746cd8b94ac732abdd47d7f06344fda
@@ -9,7 +9,7 @@ SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c
 SHA1 (patch-asmrun_signals_osdep.h) = 0e72ee5595b937384284c884c2dd2a8be32e824c
 SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1
-SHA1 (patch-configure) = df807880779a39b0ec28748542921cb6bda6e41a
+SHA1 (patch-configure) = cb7eee978dcf26d003cb041e7c2694f89065d7fd
 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 ed72e98c6db..4c727286bf4 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.16 2016/07/13 13:36:01 jperkin Exp $
+$NetBSD: patch-configure,v 1.17 2016/07/13 15:01:42 jperkin Exp $
 
 Several configure changes to work on and detect NetBSD (and some other OSes)
-
 See also: <http://caml.inria.fr/mantis/view.php?id=6900>
+
 --- configure.orig	2016-04-25 13:36:01.000000000 +0000
 +++ configure
 @@ -671,7 +671,7 @@ if test $with_sharedlibs = "yes"; then
@@ -90,7 +90,15 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900>
    x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
    x86_64-*-darwin*)             arch=amd64; system=macosx;;
    x86_64-*-mingw*)              arch=amd64; system=mingw;;
-@@ -913,7 +920,7 @@ case "$arch,$system" in
+@@ -894,7 +901,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";;
+-  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";;
+@@ -913,7 +919,7 @@ case "$arch,$system" in
    amd64,solaris)  as="${TOOLPREF}as --64"
                    aspp="${TOOLPREF}gcc -m64 -c";;
    i386,solaris)   as="${TOOLPREF}as"
@@ -99,7 +107,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900>
    power,elf)      if $arch64; then
                      as="${TOOLPREF}as -a64 -mppc64"
                      aspp="${TOOLPREF}gcc -m64 -c"
-@@ -960,6 +967,7 @@ case "$arch,$system" in
+@@ -960,6 +966,7 @@ case "$arch,$system" in
    arm,linux*) profiling='prof';;
    power,elf) profiling='prof';;
    power,bsd*) profiling='prof';;
@@ -107,7 +115,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900>
    *) profiling='noprof';;
  esac
  
-@@ -1505,6 +1513,8 @@ fi
+@@ -1505,6 +1512,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -116,7 +124,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900>
  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`
-@@ -1551,6 +1561,7 @@ if test "$x11_include" = "not found"; th
+@@ -1551,6 +1560,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -124,7 +132,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900>
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1608,6 +1619,7 @@ if test "$x11_include" = "not found"; th
+@@ -1608,6 +1618,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -132,7 +140,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900>
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1629,18 +1641,16 @@ if test "$x11_include" = "not found"; th
+@@ -1629,18 +1640,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else