diff options
author | joerg <joerg@pkgsrc.org> | 2013-11-04 16:39:32 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-11-04 16:39:32 +0000 |
commit | 937b0973b831e0d9c39cdb0254e67e46064344bb (patch) | |
tree | cef78946eaa7cf63047259f99f514b2fa02196bc /lang/ocaml/patches | |
parent | c9ca4ee801b37fd30d9a337f7c3a2b10d8a87e7d (diff) | |
download | pkgsrc-937b0973b831e0d9c39cdb0254e67e46064344bb.tar.gz |
Don't use -fno-defer-pop.
Diffstat (limited to 'lang/ocaml/patches')
-rw-r--r-- | lang/ocaml/patches/patch-configure | 66 |
1 files changed, 65 insertions, 1 deletions
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index 9e1d78e89e8..2e538aa82a1 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,8 +1,72 @@ -$NetBSD: patch-configure,v 1.6 2013/11/01 10:47:50 jaapb Exp $ +$NetBSD: patch-configure,v 1.7 2013/11/04 16:39:32 joerg Exp $ Several configure changes to work on and detect NetBSD (and some other OSes) + --- configure.orig 2013-07-23 14:48:47.000000000 +0000 +++ configure +@@ -271,14 +271,14 @@ iflexdir="" + case "$bytecc,$host" in + cc,*-*-nextstep*) + # GNU C extensions disabled, but __GNUC__ still defined! +- bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix" ++ bytecccompopts="$gcc_warnings -U__GNUC__ -posix" + bytecclinkopts="-posix";; + *,*-*-rhapsody*) + # Almost the same as NeXTStep +- bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC" ++ bytecccompopts="$gcc_warnings -DSHRINKED_GNUC" + mathlib="";; + *,*-*-darwin*) +- bytecccompopts="-fno-defer-pop $gcc_warnings" ++ bytecccompopts="$gcc_warnings" + mathlib="" + mkexe="$mkexe -Wl,-no_compact_unwind" + # Tell gcc that we can use 32-bit code addresses for threaded code +@@ -287,11 +287,11 @@ case "$bytecc,$host" in + echo "# define ARCH_CODE32" >> m.h + echo "#endif" >> m.h;; + *,*-*-beos*) +- bytecccompopts="-fno-defer-pop $gcc_warnings" ++ bytecccompopts="$gcc_warnings" + # No -lm library + mathlib="";; + gcc,alpha*-*-osf*) +- bytecccompopts="-fno-defer-pop $gcc_warnings" ++ bytecccompopts="$gcc_warnings" + if cc="$bytecc" sh ./hasgot -mieee; then + bytecccompopts="-mieee $bytecccompopts"; + fi +@@ -319,11 +319,11 @@ case "$bytecc,$host" in + bytecccompopts="-DUMK";; + gcc*,powerpc-*-aix*) + # Avoid name-space pollution by requiring Unix98-conformant includes +- bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";; ++ bytecccompopts="$gcc_warnings -D_XOPEN_SOURCE=500";; + *,powerpc-*-aix*) + bytecccompopts="-D_XOPEN_SOURCE=500";; + gcc*,*-*-cygwin*) +- bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32" ++ bytecccompopts="$gcc_warnings -U_WIN32" + dllccompopts="-U_WIN32 -DCAML_DLL" + if test $withsharedlibs = yes; then + flexlink="flexlink -chain cygwin -merge-manifest -stack 16777216" +@@ -340,14 +340,14 @@ case "$bytecc,$host" in + exe=".exe" + ostype="Cygwin";; + gcc*,x86_64-*-linux*) +- bytecccompopts="-fno-defer-pop $gcc_warnings" ++ bytecccompopts="$gcc_warnings" + # Tell gcc that we can use 32-bit code addresses for threaded code + # unless we are compiled for a shared library (-fPIC option) + echo "#ifndef __PIC__" >> m.h + echo "# define ARCH_CODE32" >> m.h + echo "#endif" >> m.h;; + gcc*) +- bytecccompopts="-fno-defer-pop $gcc_warnings";; ++ bytecccompopts="$gcc_warnings";; + esac + + # Configure compiler to use in further tests @@ -542,7 +542,7 @@ if test $withsharedlibs = "yes"; then mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" |