summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2018-01-29 14:15:57 +0000
committerjperkin <jperkin@pkgsrc.org>2018-01-29 14:15:57 +0000
commitd0012b7c755b297c9ab49f9b078d3d2f32437c43 (patch)
tree1fbbd804d4f93bec30c0139578c01f3b9bb09d7a /lang
parent9ef7c44b3eae994f3db7eee217669d6d72e8cedb (diff)
downloadpkgsrc-d0012b7c755b297c9ab49f9b078d3d2f32437c43.tar.gz
ocaml: Support SunOS/clang.
Diffstat (limited to 'lang')
-rw-r--r--lang/ocaml/distinfo4
-rw-r--r--lang/ocaml/patches/patch-configure13
2 files changed, 11 insertions, 6 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index e0bfb475ccd..67f99af71fb 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -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) = 7fb492bbc3c44bad1753b8fc6928b7b0cadac436
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
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 7dd3af7e368..274e9585f46 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -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" ;;