CVS commit: pkgsrc/lang/ocaml

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jan 29 14:15:58 UTC 2018

Modified Files:
        pkgsrc/lang/ocaml: distinfo
        pkgsrc/lang/ocaml/patches: patch-configure

Log Message:
ocaml: Support SunOS/clang.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/ocaml/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.117 pkgsrc/lang/ocaml/distinfo:1.118
--- pkgsrc/lang/ocaml/distinfo:1.117    Mon Jan 22 10:22:30 2018
+++ pkgsrc/lang/ocaml/distinfo  Mon Jan 29 14:15:57 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2018/01/22 10:22:30 wiz Exp $
+$NetBSD: distinfo,v 1.118 2018/01/29 14:15:57 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) = 7fb492bbc3c44bad
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
 SHA1 (patch-byterun_Makefile) = 02797b10d685b25c0c6f5aab8eadc324e26826e9
-SHA1 (patch-configure) = 2bd3237bd5b7a5c3baafb90f86cbfb8c0b487c67
+SHA1 (patch-configure) = ef9b53c652af594b6a38c20b66f63515b0ee1b56
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
 SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04

Index: pkgsrc/lang/ocaml/patches/patch-configure
diff -u pkgsrc/lang/ocaml/patches/patch-configure:1.30 pkgsrc/lang/ocaml/patches/patch-configure:1.31
--- pkgsrc/lang/ocaml/patches/patch-configure:1.30      Mon Jan 22 10:22:30 2018
+++ pkgsrc/lang/ocaml/patches/patch-configure   Mon Jan 29 14:15:58 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.30 2018/01/22 10:22:30 wiz Exp $
+$NetBSD: patch-configure,v 1.31 2018/01/29 14:15:58 jperkin Exp $
 
 All kinds of OS-specific changes to configure
 Honor LDFLAGS.
@@ -14,11 +14,16 @@ Honor LDFLAGS.
  
  if $with_sharedlibs; then
    case "$target" in
-@@ -823,7 +823,10 @@ if $with_sharedlibs; then
-         *gcc*)
+@@ -820,10 +820,13 @@ if $with_sharedlibs; then
+       esac;;
+     *-*-solaris2*)
+       case "$cc" in
+-        *gcc*)
++        *clang*|*gcc*)
            sharedcccompopts="-fPIC"
-           if sh ./solaris-ld; then
+-          if sh ./solaris-ld; then
 -            mksharedlib="ld -G"
++          if true; then
 +            case "$target" in
 +            x86_64*) mksharedlib="$cc -shared" ;;
 +            *)       mksharedlib="$cc -G" ;;