diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-07-07 12:15:36 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-07-07 12:15:36 +0000 |
| commit | 895b8108cf3c0bcfea05f90f3df5b99880115ec1 (patch) | |
| tree | 9ce01104c9d784bb70aca3e9490c910b5a456e82 | |
| parent | 1b2cbc698f40a4ed9e4d0cd17fcb8602566bc5e8 (diff) | |
| download | pkgsrc-895b8108cf3c0bcfea05f90f3df5b99880115ec1.tar.gz | |
Use the GCC front-end for linking on SunOS, resolves issues with SSP
and passing incompatible ld arguments. Bump PKGREVISION.
| -rw-r--r-- | lang/ocaml/Makefile | 3 | ||||
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-configure | 13 |
3 files changed, 15 insertions, 5 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index bd53f8c5c23..19415e7285e 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.103 2016/05/05 08:12:01 jaapb Exp $ +# $NetBSD: Makefile,v 1.104 2016/07/07 12:15:36 jperkin Exp $ .include "Makefile.common" +PKGREVISION= 1 #CONFIGURE_ARGS+= -no-tk #CONFIGURE_ARGS+= -cc ${CC} diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index db086f01ccc..12ffc973cf1 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.95 2016/07/06 14:19:51 jperkin Exp $ +$NetBSD: distinfo,v 1.96 2016/07/07 12:15:36 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) = 7c50db115f4f4de84669fc105dad1ece4e1f265d +SHA1 (patch-configure) = 0f0d52440112c416117b3c92ac27b6661fd5d572 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 7dbe2956e34..0ebcb7810c1 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,9 +1,9 @@ -$NetBSD: patch-configure,v 1.14 2016/05/05 08:12:01 jaapb Exp $ +$NetBSD: patch-configure,v 1.15 2016/07/07 12:15:36 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-01 12:53:41.000000000 +0000 +--- configure.orig 2016-04-25 13:36:01.000000000 +0000 +++ configure @@ -671,7 +671,7 @@ if test $with_sharedlibs = "yes"; then mkmaindll="$flexlink -maindll" @@ -14,6 +14,15 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared" bytecclinkopts="$bytecclinkopts -Wl,-E" +@@ -699,7 +699,7 @@ if test $with_sharedlibs = "yes"; then + *gcc*) + sharedcccompopts="-fPIC" + if sh ./solaris-ld; then +- mksharedlib="ld -G" ++ mksharedlib="$bytecc -shared" + byteccrpath="-R" + mksharedlibrpath="-R" + else @@ -726,7 +726,7 @@ if test $with_sharedlibs = "yes"; then byteccrpath="-Wl,-rpath," mksharedlibrpath="-rpath " |