diff options
Diffstat (limited to 'lang/ocaml/patches/patch-configure')
| -rw-r--r-- | lang/ocaml/patches/patch-configure | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index 485a18d8951..9e21b0ca1a2 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,10 +1,9 @@ -$NetBSD: patch-configure,v 1.10 2015/03/17 14:14:43 jperkin Exp $ +$NetBSD: patch-configure,v 1.11 2015/06/30 11:08:47 jaapb Exp $ Several configure changes to work on and detect NetBSD (and some other OSes) - ---- configure.orig 2014-10-03 19:25:46.000000000 +0000 +--- configure.orig 2015-05-12 14:46:37.000000000 +0000 +++ configure -@@ -318,11 +318,11 @@ TOOLCHAIN="cc" +@@ -328,11 +328,11 @@ TOOLCHAIN="cc" case "$bytecc,$target" in cc,*-*-nextstep*) # GNU C extensions disabled, but __GNUC__ still defined! @@ -18,7 +17,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) mathlib="";; *,*-*-darwin*) bytecccompopts="$gcc_warnings" -@@ -334,15 +334,15 @@ case "$bytecc,$target" in +@@ -344,15 +344,15 @@ case "$bytecc,$target" in echo "# define ARCH_CODE32" >> m.h echo "#endif" >> m.h;; *,*-*-haiku*) @@ -37,7 +36,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; fi -@@ -370,11 +370,11 @@ case "$bytecc,$target" in +@@ -380,7 +380,7 @@ case "$bytecc,$target" in bytecccompopts="-DUMK";; *gcc*,powerpc-*-aix*) # Avoid name-space pollution by requiring Unix98-conformant includes @@ -46,12 +45,16 @@ Several configure changes to work on and detect NetBSD (and some other OSes) *,powerpc-*-aix*) bytecccompopts="-D_XOPEN_SOURCE=500";; *gcc*,*-*-cygwin*) +@@ -389,7 +389,7 @@ case "$bytecc,$target" in + x86_64-*) flavor=cygwin64;; + *) err "unknown cygwin variant";; + esac - bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32" + bytecccompopts="$gcc_warnings -U_WIN32" dllccompopts="-U_WIN32 -DCAML_DLL" if test $with_sharedlibs = yes; then - flexlink="flexlink -chain cygwin -merge-manifest -stack 16777216" -@@ -395,7 +395,7 @@ case "$bytecc,$target" in + flexlink="flexlink -chain $flavor -merge-manifest -stack 16777216" +@@ -410,7 +410,7 @@ case "$bytecc,$target" in exe=".exe" ostype="Cygwin";; *gcc*,*-*-mingw*) @@ -60,7 +63,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) dllccompopt="-DCAML_DLL" if test $with_sharedlibs = yes; then case "$target" in -@@ -419,14 +419,14 @@ case "$bytecc,$target" in +@@ -434,14 +434,14 @@ case "$bytecc,$target" in SO="dll" ;; *gcc*,x86_64-*-linux*) @@ -77,7 +80,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) esac # Configure compiler to use in further tests -@@ -659,7 +659,7 @@ if test $with_sharedlibs = "yes"; then +@@ -688,7 +688,7 @@ if test $with_sharedlibs = "yes"; then mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" shared_libraries_supported=true;; @@ -86,7 +89,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared" bytecclinkopts="$bytecclinkopts -Wl,-E" -@@ -756,7 +756,7 @@ if test $with_sharedlibs = "yes"; then +@@ -785,7 +785,7 @@ if test $with_sharedlibs = "yes"; then x86_64-*-linux*) natdynlink=true;; i[3456]86-*-darwin[89].*) natdynlink=true;; i[3456]86-*-darwin*) @@ -95,7 +98,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) natdynlink=true fi;; x86_64-*-darwin*) natdynlink=true;; -@@ -770,6 +770,8 @@ if test $with_sharedlibs = "yes"; then +@@ -799,6 +799,8 @@ if test $with_sharedlibs = "yes"; then x86_64-*-openbsd*) natdynlink=true;; i[3456]86-*-netbsd*) natdynlink=true;; x86_64-*-netbsd*) natdynlink=true;; @@ -104,7 +107,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) i386-*-gnu0.3) natdynlink=true;; i[3456]86-*-haiku*) natdynlink=true;; arm*-*-linux*) natdynlink=true;; -@@ -798,6 +800,7 @@ case "$target" in +@@ -827,6 +829,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`;; @@ -112,7 +115,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) i[3456]86-*-nextstep*) arch=i386; system=nextstep;; i[3456]86-*-solaris*) if $arch64; then arch=amd64; system=solaris -@@ -807,6 +810,7 @@ case "$target" in +@@ -836,6 +839,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;; @@ -120,7 +123,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) i[3456]86-*-darwin*) if $arch64; then arch=amd64; system=macosx else -@@ -820,6 +824,7 @@ case "$target" in +@@ -849,6 +853,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;; @@ -128,7 +131,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) 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;; -@@ -835,6 +840,8 @@ case "$target" in +@@ -864,6 +869,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;; @@ -137,7 +140,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) x86_64-*-openbsd*) arch=amd64; system=openbsd;; x86_64-*-darwin*) arch=amd64; system=macosx;; x86_64-*-mingw*) arch=amd64; system=mingw;; -@@ -874,7 +881,7 @@ case "$arch,$nativecc,$system,$target" i +@@ -903,7 +910,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";; @@ -146,7 +149,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) *,gcc*,*,*) nativecccompopts="$gcc_warnings";; esac -@@ -891,7 +898,7 @@ case "$arch,$system" in +@@ -920,7 +927,7 @@ case "$arch,$system" in amd64,solaris) as="${TOOLPREF}as --64" aspp="${TOOLPREF}gcc -m64 -c";; i386,solaris) as="${TOOLPREF}as" @@ -155,7 +158,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) power,elf) as="${TOOLPREF}as -u -m ppc" aspp="${TOOLPREF}gcc -c";; power,rhapsody) as="${TOOLPREF}as -arch $model" -@@ -930,6 +937,7 @@ case "$arch,$system" in +@@ -961,6 +968,7 @@ case "$arch,$system" in arm,linux*) profiling='prof';; power,elf) profiling='prof';; power,bsd*) profiling='prof';; @@ -163,7 +166,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) *) profiling='noprof';; esac -@@ -1434,6 +1442,8 @@ fi +@@ -1475,6 +1483,8 @@ fi x11_include="not found" x11_link="not found" @@ -172,7 +175,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) 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` -@@ -1480,6 +1490,7 @@ if test "$x11_include" = "not found"; th +@@ -1521,6 +1531,7 @@ if test "$x11_include" = "not found"; th /usr/XFree86/include/X11 \ \ /usr/include \ @@ -180,7 +183,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) /usr/local/include \ /usr/unsupported/include \ /usr/athena/include \ -@@ -1537,6 +1548,7 @@ if test "$x11_include" = "not found"; th +@@ -1578,6 +1589,7 @@ if test "$x11_include" = "not found"; th \ /usr/lib64 \ /usr/lib \ @@ -188,7 +191,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) /usr/local/lib \ /usr/unsupported/lib \ /usr/athena/lib \ -@@ -1558,18 +1570,16 @@ if test "$x11_include" = "not found"; th +@@ -1599,18 +1611,16 @@ if test "$x11_include" = "not found"; th if test $dir = /usr/lib; then x11_link="-lX11" else |