diff options
author | jperkin <jperkin> | 2016-02-29 13:53:58 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2016-02-29 13:53:58 +0000 |
commit | e1d26646c997938a1bde1662578bdf9b62e02726 (patch) | |
tree | d832593a6e17f67016f6031491a673b48108ffce | |
parent | 4452ed34534d5d0815186d0252e7510cdfdeb52c (diff) | |
download | pkgsrc-e1d26646c997938a1bde1662578bdf9b62e02726.tar.gz |
Support natdynlink on SunOS. Bump PKGREVISION.
-rw-r--r-- | lang/ocaml/Makefile | 7 | ||||
-rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-configure | 28 |
3 files changed, 21 insertions, 18 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index d7e20420c3f..c6991d8bf97 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.101 2016/02/25 14:42:56 jperkin Exp $ +# $NetBSD: Makefile,v 1.102 2016/02/29 13:53:58 jperkin Exp $ .include "Makefile.common" -PKGREVISION= 2 +PKGREVISION= 3 #CONFIGURE_ARGS+= -no-tk #CONFIGURE_ARGS+= -cc ${CC} @@ -51,7 +51,8 @@ PLIST_SRC+= ${PKGDIR}/PLIST.prof !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \ !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-*) || \ - !empty(MACHINE_PLATFORM:MDarwin-*-*) + !empty(MACHINE_PLATFORM:MDarwin-*-*) || \ + !empty(MACHINE_PLATFORM:MSunOS-*-*) PLIST_SRC+= ${PKGDIR}/PLIST.natdynlink . endif .endif diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 0b8a784aa12..0e53b72ecf7 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.92 2015/12/29 23:34:52 dholland Exp $ +$NetBSD: distinfo,v 1.93 2016/02/29 13:53:58 jperkin Exp $ SHA1 (ocaml-4.02.3.tar.gz) = e68ffd2b5bb491a6345f46b27675e1361a49b274 RMD160 (ocaml-4.02.3.tar.gz) = 3946204b9396a7fb81ae1042ce67a494579c151b @@ -15,7 +15,7 @@ SHA1 (patch-byterun_Makefile) = eb27cc004d099ce5a2bcf4aed341dd5a2b35967a SHA1 (patch-byterun_caml_mlvalues.h) = 310e49ecb718825395583ae4eacb91905118886b SHA1 (patch-config_auto__aux_gethostbyaddr.c) = 79159e1b9992ca11920832642b52c6c64717b567 SHA1 (patch-config_auto__aux_gethostbyname.c) = dfb24714259938c59db0bf28a252d60f72abc421 -SHA1 (patch-configure) = d79689cf685827dd9ad2ce59ea3a8f63eb3c58a8 +SHA1 (patch-configure) = 2af864c6478404d33d5013d2035057474e56220e SHA1 (patch-debugger_Makefile.shared) = 2315c0f771ba2cb0d1f05d898db5023b5b44546b SHA1 (patch-driver_compenv.ml) = c011ba27c8d040c80408af6a4e6dcb5fc0a33902 SHA1 (patch-driver_main.ml) = b843811b36277f5dea71953df74427394ceb2398 diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index ae044cad574..f3bf3c47051 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,8 +1,9 @@ -$NetBSD: patch-configure,v 1.12 2015/08/22 10:45:13 jaapb Exp $ +$NetBSD: patch-configure,v 1.13 2016/02/29 13:53:58 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 2015-05-12 14:46:37.000000000 +0000 +++ configure @@ -328,11 +328,11 @@ TOOLCHAIN="cc" @@ -113,16 +114,17 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> x86_64-*-darwin*) natdynlink=true;; powerpc*-*-linux*) natdynlink=true;; sparc*-*-linux*) natdynlink=true;; -@@ -799,6 +795,8 @@ if test $with_sharedlibs = "yes"; then +@@ -799,6 +795,9 @@ if test $with_sharedlibs = "yes"; then x86_64-*-openbsd*) natdynlink=true;; i[3456]86-*-netbsd*) natdynlink=true;; x86_64-*-netbsd*) natdynlink=true;; + i[3456]86-*-dragonfly*) natdynlink=true;; + x86_64-*-dragonfly*) natdynlink=true;; ++ *-*-solaris*) natdynlink=true;; i386-*-gnu0.3) natdynlink=true;; i[3456]86-*-haiku*) natdynlink=true;; arm*-*-linux*) natdynlink=true;; -@@ -827,6 +825,7 @@ case "$target" in +@@ -827,6 +826,7 @@ case "$target" in sparc*-*-gnu*) arch=sparc; system=gnu;; i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; @@ -130,7 +132,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> i[3456]86-*-nextstep*) arch=i386; system=nextstep;; i[3456]86-*-solaris*) if $arch64; then arch=amd64; system=solaris -@@ -836,6 +835,7 @@ case "$target" in +@@ -836,6 +836,7 @@ case "$target" in i[3456]86-*-haiku*) arch=i386; system=beos;; i[3456]86-*-beos*) arch=i386; system=beos;; i[3456]86-*-cygwin*) arch=i386; system=cygwin;; @@ -138,7 +140,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> i[3456]86-*-darwin*) if $arch64; then arch=amd64; system=macosx else -@@ -849,6 +849,7 @@ case "$target" in +@@ -849,6 +850,7 @@ case "$target" in powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; powerpc-*-darwin*) arch=power; system=rhapsody if $arch64;then model=ppc64;else model=ppc;fi;; @@ -146,7 +148,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> armv6*-*-linux-gnueabihf) arch=arm; model=armv6; system=linux_eabihf;; arm*-*-linux-gnueabihf) arch=arm; system=linux_eabihf;; armv7*-*-linux-gnueabi) arch=arm; model=armv7; system=linux_eabi;; -@@ -864,6 +865,8 @@ case "$target" in +@@ -864,6 +866,8 @@ case "$target" in x86_64-*-gnu*) arch=amd64; system=gnu;; x86_64-*-freebsd*) arch=amd64; system=freebsd;; x86_64-*-netbsd*) arch=amd64; system=netbsd;; @@ -155,7 +157,7 @@ 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;; -@@ -903,7 +906,7 @@ case "$arch,$nativecc,$system,$target" i +@@ -903,7 +907,7 @@ case "$arch,$nativecc,$system,$target" i if $arch64; then partialld="ld -r -arch ppc64"; fi;; *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; @@ -164,7 +166,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> *,gcc*,*,*) nativecccompopts="$gcc_warnings";; esac -@@ -920,7 +923,7 @@ case "$arch,$system" in +@@ -920,7 +924,7 @@ case "$arch,$system" in amd64,solaris) as="${TOOLPREF}as --64" aspp="${TOOLPREF}gcc -m64 -c";; i386,solaris) as="${TOOLPREF}as" @@ -173,7 +175,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> power,elf) as="${TOOLPREF}as -u -m ppc" aspp="${TOOLPREF}gcc -c";; power,rhapsody) as="${TOOLPREF}as -arch $model" -@@ -961,6 +964,7 @@ case "$arch,$system" in +@@ -961,6 +965,7 @@ case "$arch,$system" in arm,linux*) profiling='prof';; power,elf) profiling='prof';; power,bsd*) profiling='prof';; @@ -181,7 +183,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> *) profiling='noprof';; esac -@@ -1475,6 +1479,8 @@ fi +@@ -1475,6 +1480,8 @@ fi x11_include="not found" x11_link="not found" @@ -190,7 +192,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` -@@ -1521,6 +1527,7 @@ if test "$x11_include" = "not found"; th +@@ -1521,6 +1528,7 @@ if test "$x11_include" = "not found"; th /usr/XFree86/include/X11 \ \ /usr/include \ @@ -198,7 +200,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> /usr/local/include \ /usr/unsupported/include \ /usr/athena/include \ -@@ -1578,6 +1585,7 @@ if test "$x11_include" = "not found"; th +@@ -1578,6 +1586,7 @@ if test "$x11_include" = "not found"; th \ /usr/lib64 \ /usr/lib \ @@ -206,7 +208,7 @@ See also: <http://caml.inria.fr/mantis/view.php?id=6900> /usr/local/lib \ /usr/unsupported/lib \ /usr/athena/lib \ -@@ -1599,18 +1607,16 @@ if test "$x11_include" = "not found"; th +@@ -1599,18 +1608,16 @@ if test "$x11_include" = "not found"; th if test $dir = /usr/lib; then x11_link="-lX11" else |