diff options
Diffstat (limited to 'src/patchsets/ocaml/3.12.0/030_all_automagic.patch')
-rw-r--r-- | src/patchsets/ocaml/3.12.0/030_all_automagic.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/src/patchsets/ocaml/3.12.0/030_all_automagic.patch b/src/patchsets/ocaml/3.12.0/030_all_automagic.patch deleted file mode 100644 index edf1c31282..0000000000 --- a/src/patchsets/ocaml/3.12.0/030_all_automagic.patch +++ /dev/null @@ -1,54 +0,0 @@ -ocaml has automagics on libX11 and gdbm -http://caml.inria.fr/mantis/view.php?id=4278 - -Index: ocaml-3.12.0/configure -=================================================================== ---- ocaml-3.12.0.orig/configure -+++ ocaml-3.12.0/configure -@@ -33,6 +33,8 @@ x11_include_dir='' - x11_lib_dir='' - tk_wanted=yes - pthread_wanted=yes -+graph_wanted=yes -+dbm_wanted=yes - tk_defs='' - tk_libs='' - tk_x11=yes -@@ -93,6 +95,10 @@ while : ; do - ;; # Ignored for backward compatibility - -no-pthread*|--no-pthread*) - pthread_wanted=no;; -+ -no-dbm|--no-dbm) -+ dbm_wanted=no;; -+ -no-graph|--no-graph) -+ graph_wanted=no;; - -no-tk|--no-tk) - tk_wanted=no;; - -partialld|--partialld) -@@ -1372,7 +1378,7 @@ do - done - - --if test "$x11_include" = "not found" || test "$x11_link" = "not found" -+if test "$x11_include" = "not found" || test "$x11_link" = "not found" || test "$graph_wanted" = "no" - then - echo "X11 not found, the \"graph\" library will not be supported." - x11_include="" -@@ -1420,7 +1426,7 @@ for dir in /usr/include /usr/include/db1 - break - fi - done --if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then -+if test "$dbm_include" = "not found" || test "$dbm_link" = "not found" || test "$dbm_wanted" = "no"; then - echo "NDBM not found, the \"dbm\" library will not be supported." - else - echo "NDBM found (in $dbm_include)" -@@ -1722,7 +1728,7 @@ echo " $otherlibraries" - echo "Configuration for the \"num\" library:" - echo " target architecture ...... $bng_arch (asm level $bng_asm_level)" - --if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then -+if test "$x11_include" != "not found" && test "$x11_lib" != "not found" && test "$graph_wanted" != "no"; then - echo "Configuration for the \"graph\" library:" - echo " options for compiling .... $x11_include" - echo " options for linking ...... $x11_link" |