diff options
| author | adam <adam@pkgsrc.org> | 2019-11-24 09:23:13 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2019-11-24 09:23:13 +0000 |
| commit | 0bf94215cdd422ab14e80d002160129b70250ddf (patch) | |
| tree | 1ba84af4d07ec027f1b814c568bed6a7298afeee /lang/ocaml/patches | |
| parent | 0b6b9d84071ecd9bfa402e08423f5aa0d6bb6a48 (diff) | |
| download | pkgsrc-0bf94215cdd422ab14e80d002160129b70250ddf.tar.gz | |
ocaml: fix installation on Darwin + minor cleanups
Diffstat (limited to 'lang/ocaml/patches')
| -rw-r--r-- | lang/ocaml/patches/patch-configure | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index e3962a3465c..387f288ff53 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.39 2019/10/04 10:33:21 maya Exp $ +$NetBSD: patch-configure,v 1.40 2019/11/24 09:23:13 adam Exp $ All kinds of OS-specific changes to configure Honor LDFLAGS. @@ -9,16 +9,16 @@ Recognise SunOS as having shared libraries --- configure.orig 2019-08-05 17:32:44.000000000 +0000 +++ configure -@@ -13311,7 +13311,7 @@ sharedlib_cflags='' +@@ -13311,7 +13317,7 @@ sharedlib_cflags='' mksharedlib='shared-libs-not-available' rpath='' mksharedlibrpath='' -natdynlinkopts="" -+natdynlinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib" ++natdynlinkopts="-L/usr/lib -R/usr/lib -R$(PREFIX)/lib" if test x"$enable_shared" != "xno"; then : case $host in #( -@@ -13347,9 +13347,14 @@ esac ;; #( +@@ -13347,9 +13353,14 @@ esac ;; #( rpath="-Wl,-rpath," mksharedlibrpath="-Wl,-rpath," natdynlinkopts="-Wl,-E" @@ -35,7 +35,7 @@ Recognise SunOS as having shared libraries esac fi -@@ -13403,6 +13408,8 @@ fi ;; #( +@@ -13403,6 +13414,8 @@ fi ;; #( natdynlink=true ;; #( x86_64-*-netbsd*) : natdynlink=true ;; #( @@ -44,7 +44,7 @@ Recognise SunOS as having shared libraries i386-*-gnu0.3) : natdynlink=true ;; #( i[3456]86-*-haiku*) : -@@ -13415,6 +13422,8 @@ fi ;; #( +@@ -13415,6 +13428,8 @@ fi ;; #( natdynlink=true ;; #( aarch64-*-linux*) : natdynlink=true ;; #( @@ -53,7 +53,7 @@ Recognise SunOS as having shared libraries *) : ;; esac -@@ -13466,6 +13475,8 @@ case $host in #( +@@ -13466,6 +13481,8 @@ case $host in #( arch=i386; system=beos ;; #( i[3456]86-*-cygwin) : arch=i386; system=cygwin ;; #( @@ -62,7 +62,7 @@ Recognise SunOS as having shared libraries i[3456]86-*-darwin*) : if $arch64; then : arch=amd64 -@@ -13510,6 +13521,10 @@ fi; system=elf ;; #( +@@ -13510,6 +13527,10 @@ fi; system=elf ;; #( arch=arm; model=armv6; system=linux_eabi ;; #( armv6*-*-freebsd*) : arch=arm; model=armv6; system=freebsd ;; #( @@ -73,7 +73,7 @@ Recognise SunOS as having shared libraries earmv6*-*-netbsd*) : arch=arm; model=armv6; system=netbsd ;; #( earmv7*-*-netbsd*) : -@@ -13544,8 +13559,12 @@ fi; system=elf ;; #( +@@ -13544,8 +13565,12 @@ fi; system=elf ;; #( arch=amd64; system=mingw64 ;; #( aarch64-*-linux*) : arch=arm64; system=linux ;; #( @@ -87,7 +87,7 @@ Recognise SunOS as having shared libraries ;; #( *) : ;; -@@ -13884,7 +13903,7 @@ fi +@@ -13884,7 +13909,7 @@ fi # for the moment, to be backward-compatible case $host in #( @@ -96,7 +96,7 @@ Recognise SunOS as having shared libraries ;; #( *) : has_c99_float_ops=true -@@ -14085,6 +14104,9 @@ case $host in #( +@@ -14085,6 +14110,9 @@ case $host in #( *-*-mingw32|*-pc-windows) : cclibs="$cclibs -lws2_32" sockets=true ;; #( |