diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-03-08 23:05:30 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-03-10 02:17:25 +0100 |
| commit | 6cca9ba40d61313fd59d34ff6138f8884a26ef51 (patch) | |
| tree | c61423dc69ad7bfbf31c7a872473ac4ea016c7d8 /community/ocaml/020_all_configure.patch | |
| parent | 500d952707ca2e8896377b44dea15cc3388ad6d5 (diff) | |
| download | aports-6cca9ba40d61313fd59d34ff6138f8884a26ef51.tar.bz2 aports-6cca9ba40d61313fd59d34ff6138f8884a26ef51.tar.xz | |
community/ocaml: upgrade to 4.06.0
Diffstat (limited to 'community/ocaml/020_all_configure.patch')
| -rw-r--r-- | community/ocaml/020_all_configure.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/community/ocaml/020_all_configure.patch b/community/ocaml/020_all_configure.patch deleted file mode 100644 index 4505a987ec..0000000000 --- a/community/ocaml/020_all_configure.patch +++ /dev/null @@ -1,51 +0,0 @@ -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.03.0+beta1/configure -=================================================================== ---- ocaml-4.03.0+beta1.orig/configure -+++ ocaml-4.03.0+beta1/configure -@@ -290,7 +290,7 @@ esac - # Configure the bytecode compiler - - bytecc="$cc" --mkexe="\$(BYTECC)" -+mkexe="\$(BYTECC) \$(BYTECCLINKOPTS)" - mkexedebugflag="-g" - bytecccompopts="" - bytecclinkopts="" -@@ -1671,6 +1671,16 @@ fi - echo "X11_INCLUDES=$x11_include" >> Makefile - echo "X11_LINK=$x11_link" >> Makefile - -+bytecccompopts="$CFLAGS $bytecccompopts" -+bytecclinkopts="$LDFLAGS $bytecclinkopts" -+natdynlinkopts="$LDFLAGS $natdynlinkopts" -+nativeccrawlinkopts="$RAW_LDFLAGS $nativecclinkopts" -+nativecclinkopts="$LDFLAGS $nativecclinkopts" -+nativecccompopts="$CFLAGS $nativecccompopts" -+nativeccprofopts="$nativecccompopts" -+mksharedlib="$mksharedlib $LDFLAGS" -+mkmaindll="$mkmaindll $LDFLAGS" -+ - # 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 -+echo "NATIVECCRAWLINKOPTS=$nativeccrawlinkopts" >> Makefile - echo "NATIVECCRPATH=$nativeccrpath" >> Makefile - echo "NATIVECCLIBS=$cclibs $dllib" >> Makefile - echo "ASM=$as" >> Makefile -@@ -1780,7 +1791,7 @@ echo "OTHERLIBRARIES=$otherlibraries" >> - echo "CC_PROFILE=$cc_profile" >> Makefile - echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile - echo "PARTIALLD=$partialld" >> Makefile --echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " \ -+echo "PACKLD=\$(PARTIALLD) \$(NATIVECCRAWLINKOPTS) -o " \ - | sed -e 's/ $/\\ /' >> Makefile - echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile - echo "IFLEXDIR=$iflexdir" >> Makefile |