diff options
Diffstat (limited to 'testing/ocaml/020_all_configure.patch')
| -rw-r--r-- | testing/ocaml/020_all_configure.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/testing/ocaml/020_all_configure.patch b/testing/ocaml/020_all_configure.patch index 5c4dbf064e..4505a987ec 100644 --- a/testing/ocaml/020_all_configure.patch +++ b/testing/ocaml/020_all_configure.patch @@ -2,11 +2,11 @@ The configure script doesn't inherit previous defined variables, overwriting previous declarations of bytecccompopts, bytecclinkopts, nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267. -Index: ocaml-4.02.2/configure +Index: ocaml-4.03.0+beta1/configure =================================================================== ---- ocaml-4.02.2.orig/configure -+++ ocaml-4.02.2/configure -@@ -314,7 +314,7 @@ esac +--- ocaml-4.03.0+beta1.orig/configure ++++ ocaml-4.03.0+beta1/configure +@@ -290,7 +290,7 @@ esac # Configure the bytecode compiler bytecc="$cc" @@ -15,9 +15,9 @@ Index: ocaml-4.02.2/configure mkexedebugflag="-g" bytecccompopts="" bytecclinkopts="" -@@ -1694,7 +1694,15 @@ sharedcccompopts="-O $sharedcccompopts" - - # Final twiddling of compiler options to work around known bugs +@@ -1671,6 +1671,16 @@ fi + echo "X11_INCLUDES=$x11_include" >> Makefile + echo "X11_LINK=$x11_link" >> Makefile +bytecccompopts="$CFLAGS $bytecccompopts" +bytecclinkopts="$LDFLAGS $bytecclinkopts" @@ -25,13 +25,14 @@ Index: ocaml-4.02.2/configure +nativeccrawlinkopts="$RAW_LDFLAGS $nativecclinkopts" +nativecclinkopts="$LDFLAGS $nativecclinkopts" +nativecccompopts="$CFLAGS $nativecccompopts" - nativeccprofopts="$nativecccompopts" ++nativeccprofopts="$nativecccompopts" +mksharedlib="$mksharedlib $LDFLAGS" +mkmaindll="$mkmaindll $LDFLAGS" - case "$buggycc" in - gcc.2.96) - bytecccompopts="$bytecccompopts -fomit-frame-pointer" -@@ -1730,6 +1738,7 @@ echo "NATIVECC=$nativecc" >> Makefile ++ + # Look for BFD library + + if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \ +@@ -1769,6 +1779,7 @@ echo "NATIVECC=$nativecc" >> Makefile echo "NATIVECCCOMPOPTS=$nativecccompopts" >> Makefile echo "NATIVECCPROFOPTS=$nativeccprofopts" >> Makefile echo "NATIVECCLINKOPTS=$nativecclinkopts" >> Makefile @@ -39,7 +40,7 @@ Index: ocaml-4.02.2/configure echo "NATIVECCRPATH=$nativeccrpath" >> Makefile echo "NATIVECCLIBS=$cclibs $dllib" >> Makefile echo "ASM=$as" >> Makefile -@@ -1741,7 +1750,7 @@ echo "OTHERLIBRARIES=$otherlibraries" >> +@@ -1780,7 +1791,7 @@ echo "OTHERLIBRARIES=$otherlibraries" >> echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile |