pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ocaml ocaml: claim natdynlink support on solaris....
details: https://anonhg.NetBSD.org/pkgsrc/rev/1f23f3787da3
branches: trunk
changeset: 415243:1f23f3787da3
user: maya <maya%pkgsrc.org@localhost>
date: Fri Oct 04 10:33:21 2019 +0000
description:
ocaml: claim natdynlink support on solaris. bump PKGREVISION
fixes ocaml-findlib PLIST issue.
diffstat:
lang/ocaml/Makefile | 7 ++++---
lang/ocaml/distinfo | 4 ++--
lang/ocaml/patches/patch-configure | 27 ++++++++++++++++++---------
3 files changed, 24 insertions(+), 14 deletions(-)
diffs (132 lines):
diff -r 08d35720e193 -r 1f23f3787da3 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Fri Oct 04 09:34:58 2019 +0000
+++ b/lang/ocaml/Makefile Fri Oct 04 10:33:21 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.129 2019/10/01 09:07:33 maya Exp $
+# $NetBSD: Makefile,v 1.130 2019/10/04 10:33:21 maya Exp $
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
BUILD_TARGET= world
MAKE_JOBS_SAFE= no
@@ -52,7 +52,8 @@
!empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
!empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
(!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)) || \
- !empty(MACHINE_PLATFORM:MDarwin-*-*)
+ !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
+ !empty(MACHINE_PLATFORM:MSunOS-*-*)
PLIST.ocaml-nat= yes
. endif
.endif
diff -r 08d35720e193 -r 1f23f3787da3 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo Fri Oct 04 09:34:58 2019 +0000
+++ b/lang/ocaml/distinfo Fri Oct 04 10:33:21 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.131 2019/10/01 09:52:51 maya Exp $
+$NetBSD: distinfo,v 1.132 2019/10/04 10:33:21 maya Exp $
SHA1 (ocaml-4.08.1.tar.gz) = f89ae7513ee4f064c7db92066f9dd4ac085634e2
RMD160 (ocaml-4.08.1.tar.gz) = a8c0b80d9b6ff52c9a5725eec3ce64adffd81ca6
@@ -9,7 +9,7 @@
SHA1 (patch-asmcomp_amd64_emit.mlp) = 1bc44434fbe1821d3aa2eed1a6b0938258586851
SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
SHA1 (patch-asmrun_amd64.S) = 68d8f3ba1c1ad951e688539b4659aee71a527222
-SHA1 (patch-configure) = 3b43429065b093174bb89329a8f5ed16ac46fc6d
+SHA1 (patch-configure) = 28243f1cf36cd26281e620617d2fe1937fd59372
SHA1 (patch-driver_compenv.ml) = 27c68072bd73c9c00d2b3093d8c6498f192ca3d3
SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
diff -r 08d35720e193 -r 1f23f3787da3 lang/ocaml/patches/patch-configure
--- a/lang/ocaml/patches/patch-configure Fri Oct 04 09:34:58 2019 +0000
+++ b/lang/ocaml/patches/patch-configure Fri Oct 04 10:33:21 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.38 2019/10/01 09:07:33 maya Exp $
+$NetBSD: patch-configure,v 1.39 2019/10/04 10:33:21 maya Exp $
All kinds of OS-specific changes to configure
Honor LDFLAGS.
@@ -7,7 +7,7 @@
Recognise SunOS/amd64 as amd64
Recognise SunOS as having shared libraries
---- configure.orig 2019-03-01 15:13:45.000000000 +0000
+--- configure.orig 2019-08-05 17:32:44.000000000 +0000
+++ configure
@@ -13311,7 +13311,7 @@ sharedlib_cflags=''
mksharedlib='shared-libs-not-available'
@@ -18,7 +18,7 @@
if test x"$enable_shared" != "xno"; then :
case $host in #(
-@@ -13347,9 +13335,14 @@ esac ;; #(
+@@ -13347,9 +13347,14 @@ esac ;; #(
rpath="-Wl,-rpath,"
mksharedlibrpath="-Wl,-rpath,"
natdynlinkopts="-Wl,-E"
@@ -35,7 +35,16 @@
esac
fi
-@@ -13415,6 +13415,8 @@ fi ;; #(
+@@ -13403,6 +13408,8 @@ fi ;; #(
+ natdynlink=true ;; #(
+ x86_64-*-netbsd*) :
+ natdynlink=true ;; #(
++ x86_64-*-solaris*) :
++ natdynlink=true ;; #(
+ i386-*-gnu0.3) :
+ natdynlink=true ;; #(
+ i[3456]86-*-haiku*) :
+@@ -13415,6 +13422,8 @@ fi ;; #(
natdynlink=true ;; #(
aarch64-*-linux*) :
natdynlink=true ;; #(
@@ -44,7 +53,7 @@
*) :
;;
esac
-@@ -13466,6 +13468,8 @@ case $host in #(
+@@ -13466,6 +13475,8 @@ case $host in #(
arch=i386; system=beos ;; #(
i[3456]86-*-cygwin) :
arch=i386; system=cygwin ;; #(
@@ -53,7 +62,7 @@
i[3456]86-*-darwin*) :
if $arch64; then :
arch=amd64
-@@ -13510,6 +13514,10 @@ fi; system=elf ;; #(
+@@ -13510,6 +13521,10 @@ fi; system=elf ;; #(
arch=arm; model=armv6; system=linux_eabi ;; #(
armv6*-*-freebsd*) :
arch=arm; model=armv6; system=freebsd ;; #(
@@ -64,7 +73,7 @@
earmv6*-*-netbsd*) :
arch=arm; model=armv6; system=netbsd ;; #(
earmv7*-*-netbsd*) :
-@@ -13544,8 +13552,12 @@ fi; system=elf ;; #(
+@@ -13544,8 +13559,12 @@ fi; system=elf ;; #(
arch=amd64; system=mingw64 ;; #(
aarch64-*-linux*) :
arch=arm64; system=linux ;; #(
@@ -78,7 +87,7 @@
;; #(
*) :
;;
-@@ -13884,7 +13896,7 @@ fi
+@@ -13884,7 +13903,7 @@ fi
# for the moment, to be backward-compatible
case $host in #(
@@ -87,7 +96,7 @@
;; #(
*) :
has_c99_float_ops=true
-@@ -14085,6 +14097,9 @@ case $host in #(
+@@ -14085,6 +14104,9 @@ case $host in #(
*-*-mingw32|*-pc-windows) :
cclibs="$cclibs -lws2_32"
sockets=true ;; #(
Home |
Main Index |
Thread Index |
Old Index