Thu Jul 7 12:15:36 2016 UTC ()
Use the GCC front-end for linking on SunOS, resolves issues with SSP
and passing incompatible ld arguments.  Bump PKGREVISION.


(jperkin)
diff -r1.103 -r1.104 pkgsrc/lang/ocaml/Makefile
diff -r1.95 -r1.96 pkgsrc/lang/ocaml/distinfo
diff -r1.14 -r1.15 pkgsrc/lang/ocaml/patches/patch-configure
cvs diff -r1.103 -r1.104 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2016/05/05 08:12:01 1.103
+++ pkgsrc/lang/ocaml/Makefile 2016/07/07 12:15:36 1.104
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.103 2016/05/05 08:12:01 jaapb Exp $ 1# $NetBSD: Makefile,v 1.104 2016/07/07 12:15:36 jperkin Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
 5PKGREVISION= 1
5 6
6#CONFIGURE_ARGS+= -no-tk 7#CONFIGURE_ARGS+= -no-tk
7#CONFIGURE_ARGS+= -cc ${CC} 8#CONFIGURE_ARGS+= -cc ${CC}
8CONFIGURE_ENV+= disable_x11=yes 9CONFIGURE_ENV+= disable_x11=yes
9 10
10BUILD_TARGET= world 11BUILD_TARGET= world
11MAKE_JOBS_SAFE= no 12MAKE_JOBS_SAFE= no
12UNLIMIT_RESOURCES= stacksize 13UNLIMIT_RESOURCES= stacksize
13 14
14USE_GCC_RUNTIME= yes 15USE_GCC_RUNTIME= yes
15 16
16### 17###
17### PLIST components 18### PLIST components
cvs diff -r1.95 -r1.96 pkgsrc/lang/ocaml/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/distinfo 2016/07/06 14:19:51 1.95
+++ pkgsrc/lang/ocaml/distinfo 2016/07/07 12:15:36 1.96
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.95 2016/07/06 14:19:51 jperkin Exp $ 1$NetBSD: distinfo,v 1.96 2016/07/07 12:15:36 jperkin Exp $
2 2
3SHA1 (ocaml-4.03.0.tar.gz) = 28773fd89507dbc400a366b886425436569e70d8 3SHA1 (ocaml-4.03.0.tar.gz) = 28773fd89507dbc400a366b886425436569e70d8
4RMD160 (ocaml-4.03.0.tar.gz) = 774934e72746cd8b94ac732abdd47d7f06344fda 4RMD160 (ocaml-4.03.0.tar.gz) = 774934e72746cd8b94ac732abdd47d7f06344fda
5SHA512 (ocaml-4.03.0.tar.gz) = 91d5c0b2fcc52fc05be64bf54d3c7be8d77ee754e847907909d4e123c1d00c9f62523770d56bb81f80200f75ec53ab874e031ce46f7b437febbd3a8e6800e2ca 5SHA512 (ocaml-4.03.0.tar.gz) = 91d5c0b2fcc52fc05be64bf54d3c7be8d77ee754e847907909d4e123c1d00c9f62523770d56bb81f80200f75ec53ab874e031ce46f7b437febbd3a8e6800e2ca
6Size (ocaml-4.03.0.tar.gz) = 3388739 bytes 6Size (ocaml-4.03.0.tar.gz) = 3388739 bytes
7SHA1 (patch-Makefile) = 22d05d1f246d9adb7bdcce1ce6d5ee85434610d6 7SHA1 (patch-Makefile) = 22d05d1f246d9adb7bdcce1ce6d5ee85434610d6
8SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f 8SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
9SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c 9SHA1 (patch-asmrun_Makefile) = 923b46ebf5fb56693b8335787846dafda936b34c
10SHA1 (patch-asmrun_signals_osdep.h) = 0e72ee5595b937384284c884c2dd2a8be32e824c 10SHA1 (patch-asmrun_signals_osdep.h) = 0e72ee5595b937384284c884c2dd2a8be32e824c
11SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1 11SHA1 (patch-byterun_Makefile) = b9b14b097904fbde4b738b89461991411e985ae1
12SHA1 (patch-configure) = 7c50db115f4f4de84669fc105dad1ece4e1f265d 12SHA1 (patch-configure) = 0f0d52440112c416117b3c92ac27b6661fd5d572
13SHA1 (patch-debugger_Makefile.shared) = f0aac2e10b7ccf2e8e43bbbd3fd3e59e4dc4eeae 13SHA1 (patch-debugger_Makefile.shared) = f0aac2e10b7ccf2e8e43bbbd3fd3e59e4dc4eeae
14SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306 14SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306
15SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991 15SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
16SHA1 (patch-driver_main_args.ml) = d5acaf894eb6e44e4438dace7814f669f7154e63 16SHA1 (patch-driver_main_args.ml) = d5acaf894eb6e44e4438dace7814f669f7154e63
17SHA1 (patch-driver_main_args.mli) = 5b883f780be0527dbfa993267b93799be5aaee14 17SHA1 (patch-driver_main_args.mli) = 5b883f780be0527dbfa993267b93799be5aaee14
18SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3 18SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3
19SHA1 (patch-man_Makefile) = f4fcde662061e7e7e664ec42617f1e37f1fcf214 19SHA1 (patch-man_Makefile) = f4fcde662061e7e7e664ec42617f1e37f1fcf214
20SHA1 (patch-ocamldoc_Makefile) = ba4e2c76e1f2832988dd6933cd9d68a7ba3fb870 20SHA1 (patch-ocamldoc_Makefile) = ba4e2c76e1f2832988dd6933cd9d68a7ba3fb870
21SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b 21SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
22SHA1 (patch-otherlibs_Makefile) = 839485e6576dcee53420a1bb75f49f7168b12427 22SHA1 (patch-otherlibs_Makefile) = 839485e6576dcee53420a1bb75f49f7168b12427
23SHA1 (patch-otherlibs_Makefile.shared) = 86cd1c0e47f918b0231fdc341f27e742a8ae74b5 23SHA1 (patch-otherlibs_Makefile.shared) = 86cd1c0e47f918b0231fdc341f27e742a8ae74b5
24SHA1 (patch-otherlibs_bigarray_mmap__unix.c) = 0cc724cf172b9e389a0ec05a7a25ab1f45ede037 24SHA1 (patch-otherlibs_bigarray_mmap__unix.c) = 0cc724cf172b9e389a0ec05a7a25ab1f45ede037
25SHA1 (patch-otherlibs_dynlink_Makefile) = f892254a5e5a01462ecbf68e45f9bfe5783158d3 25SHA1 (patch-otherlibs_dynlink_Makefile) = f892254a5e5a01462ecbf68e45f9bfe5783158d3
cvs diff -r1.14 -r1.15 pkgsrc/lang/ocaml/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/patches/patch-configure 2016/05/05 08:12:01 1.14
+++ pkgsrc/lang/ocaml/patches/patch-configure 2016/07/07 12:15:36 1.15
@@ -1,29 +1,38 @@ @@ -1,29 +1,38 @@
1$NetBSD: patch-configure,v 1.14 2016/05/05 08:12:01 jaapb Exp $ 1$NetBSD: patch-configure,v 1.15 2016/07/07 12:15:36 jperkin Exp $
2 2
3Several configure changes to work on and detect NetBSD (and some other OSes) 3Several configure changes to work on and detect NetBSD (and some other OSes)
4 4
5See also: <http://caml.inria.fr/mantis/view.php?id=6900> 5See also: <http://caml.inria.fr/mantis/view.php?id=6900>
6--- configure.orig 2016-04-01 12:53:41.000000000 +0000 6--- configure.orig 2016-04-25 13:36:01.000000000 +0000
7+++ configure 7+++ configure
8@@ -671,7 +671,7 @@ if test $with_sharedlibs = "yes"; then 8@@ -671,7 +671,7 @@ if test $with_sharedlibs = "yes"; then
9 mkmaindll="$flexlink -maindll" 9 mkmaindll="$flexlink -maindll"
10 shared_libraries_supported=true;; 10 shared_libraries_supported=true;;
11 *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\ 11 *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
12- |*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*) 12- |*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
13+ |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly|*-*-gnu*|*-*-haiku*) 13+ |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly|*-*-gnu*|*-*-haiku*)
14 sharedcccompopts="-fPIC" 14 sharedcccompopts="-fPIC"
15 mksharedlib="$bytecc -shared" 15 mksharedlib="$bytecc -shared"
16 bytecclinkopts="$bytecclinkopts -Wl,-E" 16 bytecclinkopts="$bytecclinkopts -Wl,-E"
 17@@ -699,7 +699,7 @@ if test $with_sharedlibs = "yes"; then
 18 *gcc*)
 19 sharedcccompopts="-fPIC"
 20 if sh ./solaris-ld; then
 21- mksharedlib="ld -G"
 22+ mksharedlib="$bytecc -shared"
 23 byteccrpath="-R"
 24 mksharedlibrpath="-R"
 25 else
17@@ -726,7 +726,7 @@ if test $with_sharedlibs = "yes"; then 26@@ -726,7 +726,7 @@ if test $with_sharedlibs = "yes"; then
18 byteccrpath="-Wl,-rpath," 27 byteccrpath="-Wl,-rpath,"
19 mksharedlibrpath="-rpath " 28 mksharedlibrpath="-rpath "
20 shared_libraries_supported=true;; 29 shared_libraries_supported=true;;
21- i[3456]86-*-darwin[89].*) 30- i[3456]86-*-darwin[89].*)
22+ i[3456]86-*-darwin*) 31+ i[3456]86-*-darwin*)
23 mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress \ 32 mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress \
24 -read_only_relocs suppress" 33 -read_only_relocs suppress"
25 bytecccompopts="$dl_defs $bytecccompopts" 34 bytecccompopts="$dl_defs $bytecccompopts"
26@@ -768,11 +768,7 @@ if test $with_sharedlibs = "yes"; then 35@@ -768,11 +768,7 @@ if test $with_sharedlibs = "yes"; then
27 i[3456]86-*-linux*) natdynlink=true;; 36 i[3456]86-*-linux*) natdynlink=true;;
28 i[3456]86-*-gnu*) natdynlink=true;; 37 i[3456]86-*-gnu*) natdynlink=true;;
29 x86_64-*-linux*) natdynlink=true;; 38 x86_64-*-linux*) natdynlink=true;;