summaryrefslogtreecommitdiff
path: root/lang/ocaml/patches/patch-configure
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2020-01-14 19:53:35 +0000
committerjaapb <jaapb@pkgsrc.org>2020-01-14 19:53:35 +0000
commitfa56713f75b271170f97bc1243644d3da81ffdf3 (patch)
tree4a22c2688818fefbd1911d7b24954c59f5a063d4 /lang/ocaml/patches/patch-configure
parent45e47d39e9d558873f5e7f8244de7e0518ff96bc (diff)
downloadpkgsrc-fa56713f75b271170f97bc1243644d3da81ffdf3.tar.gz
Updated lang/ocaml to version 4.09.0.
Highlights of this release are: * new optimisations, in particular for affine functions in matches; * the graphics library was moved out of the main distribution; * the vmthread library was removed; * support for compiler plugins was removed; * many bug fixes. For more details see the Changes file in the distribution.
Diffstat (limited to 'lang/ocaml/patches/patch-configure')
-rw-r--r--lang/ocaml/patches/patch-configure77
1 files changed, 18 insertions, 59 deletions
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 387f288ff53..df92307895a 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.40 2019/11/24 09:23:13 adam Exp $
+$NetBSD: patch-configure,v 1.41 2020/01/14 19:53:35 jaapb Exp $
All kinds of OS-specific changes to configure
Honor LDFLAGS.
@@ -7,62 +7,36 @@ Add SunOS -lnsl -lsocket
Recognise SunOS/amd64 as amd64
Recognise SunOS as having shared libraries
---- configure.orig 2019-08-05 17:32:44.000000000 +0000
+--- configure.orig 2019-09-11 14:40:30.000000000 +0000
+++ configure
-@@ -13311,7 +13317,7 @@ sharedlib_cflags=''
+@@ -13281,7 +13281,7 @@ sharedlib_cflags=''
mksharedlib='shared-libs-not-available'
rpath=''
mksharedlibrpath=''
-natdynlinkopts=""
-+natdynlinkopts="-L/usr/lib -R/usr/lib -R$(PREFIX)/lib"
++natdynlinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib"
if test x"$enable_shared" != "xno"; then :
case $host in #(
-@@ -13347,9 +13353,14 @@ esac ;; #(
- rpath="-Wl,-rpath,"
- mksharedlibrpath="-Wl,-rpath,"
- natdynlinkopts="-Wl,-E"
-- shared_libraries_supported=true ;; #(
-+ shared_libraries_supported=true
-+ *-*-solaris* ;; #(
- *) :
-- ;;
-+ sharedlib_cflags="-fPIC"
-+ mksharedlib="$CC -shared"
-+ rpath="-Wl,-rpath,"
-+ mksharedlibrpath="-Wl,-rpath,"
-+ shared_libraries_supported=true ;;
- esac
- fi
-
-@@ -13403,6 +13414,8 @@ fi ;; #(
- natdynlink=true ;; #(
- x86_64-*-netbsd*) :
- natdynlink=true ;; #(
-+ x86_64-*-solaris*) :
-+ natdynlink=true ;; #(
- i386-*-gnu0.3) :
+@@ -13383,6 +13383,8 @@ if test x"$enable_shared" != "xno"; then
natdynlink=true ;; #(
- i[3456]86-*-haiku*) :
-@@ -13415,6 +13428,8 @@ fi ;; #(
- natdynlink=true ;; #(
- aarch64-*-linux*) :
+ aarch64-*-freebsd*) :
natdynlink=true ;; #(
+ aarch64-*-netbsd*) :
+ natdynlink=true ;; #(
*) :
;;
esac
-@@ -13466,6 +13481,8 @@ case $host in #(
+@@ -13434,6 +13436,8 @@ case $host in #(
arch=i386; system=beos ;; #(
i[3456]86-*-cygwin) :
arch=i386; system=cygwin ;; #(
-+ i[3456]86-*-interix3) :
-+ arch=i386; system=interix3 ;; #(
- i[3456]86-*-darwin*) :
- if $arch64; then :
- arch=amd64
-@@ -13510,6 +13527,10 @@ fi; system=elf ;; #(
++ i[3456]86-*-interix3) :
++ arch=i386; system=interix3 ;; #(
+ i[3456]86-*-gnu*) :
+ arch=i386; system=gnu ;; #(
+ i[3456]86-*-mingw32) :
+@@ -13468,6 +13472,10 @@ fi; system=elf ;; #(
arch=arm; model=armv6; system=linux_eabi ;; #(
armv6*-*-freebsd*) :
arch=arm; model=armv6; system=freebsd ;; #(
@@ -73,21 +47,16 @@ Recognise SunOS as having shared libraries
earmv6*-*-netbsd*) :
arch=arm; model=armv6; system=netbsd ;; #(
earmv7*-*-netbsd*) :
-@@ -13544,8 +13565,12 @@ fi; system=elf ;; #(
- arch=amd64; system=mingw64 ;; #(
- aarch64-*-linux*) :
+@@ -13504,6 +13512,8 @@ fi; system=elf ;; #(
arch=arm64; system=linux ;; #(
+ aarch64-*-freebsd*) :
+ arch=arm64; system=freebsd ;; #(
+ aarch64-*-netbsd*) :
+ arch=arm64; system=netbsd ;; #(
x86_64-*-cygwin*) :
-- arch=amd64; system=cygwin
-+ arch=amd64; system=cygwin ;; #(
-+ x86_64-*-solaris*) :
-+ arch=amd64; system=solaris
+ arch=amd64; system=cygwin
;; #(
- *) :
- ;;
-@@ -13884,7 +13909,7 @@ fi
+@@ -13788,7 +13798,7 @@ fi
# for the moment, to be backward-compatible
case $host in #(
@@ -96,13 +65,3 @@ Recognise SunOS as having shared libraries
;; #(
*) :
has_c99_float_ops=true
-@@ -14085,6 +14110,9 @@ case $host in #(
- *-*-mingw32|*-pc-windows) :
- cclibs="$cclibs -lws2_32"
- sockets=true ;; #(
-+ *-*-solaris*) :
-+ cclibs="$cclibs -lnsl -lsocket"
-+ sockets=true ;; #(
- *) :
-
- ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"