- updated to 3.09

[packages/ocaml.git] / ocaml-build.patch

diff --git a/ocaml-build.patch b/ocaml-build.patch
index 7a3ac66d4eecbc1d30658c684795c8c2545a1cbb..45d278a56e960f104857efddd91baae067a852dc 100644 (file)
--- a/ocaml-build.patch
+++ b/ocaml-build.patch
@@ -1,24 +1,34 @@
-diff -ur ocaml-3.04/camlp4/meta/Makefile ocaml-3.04-/camlp4/meta/Makefile
---- ocaml-3.04/camlp4/meta/Makefile    Sat Sep 29 03:08:35 2001
-+++ ocaml-3.04-/camlp4/meta/Makefile   Thu Jan 31 17:20:03 2002
+diff -ur ocaml-3.05/camlp4/meta/Makefile ocaml-3.05-/camlp4/meta/Makefile
+--- ocaml-3.05/camlp4/meta/Makefile    Fri Jul 19 16:53:49 2002
++++ ocaml-3.05-/camlp4/meta/Makefile   Thu Aug  8 13:19:11 2002
 @@ -2,7 +2,7 @@
  
  include ../config/Makefile
  
 -INCLUDES=-I ../camlp4 -I ../boot -I $(OTOP)/utils
 +INCLUDES=-I ../camlp4 -I ../boot -I $(OTOP)/utils -I $(OTOP)/parsing
- OCAMLCFLAGS=$(INCLUDES)
+ OCAMLCFLAGS=-warn-error A $(INCLUDES)
  OBJS=q_MLast.cmo pa_r.cmo pa_rp.cmo pa_extend.cmo pa_extend_m.cmo pa_ifdef.cmo pr_dump.cmo
  CAMLP4RM=pa_r.cmo pa_rp.cmo pr_dump.cmo
-diff -ur ocaml-3.04/camlp4/ocaml_src/meta/Makefile ocaml-3.04-/camlp4/ocaml_src/meta/Makefile
---- ocaml-3.04/camlp4/ocaml_src/meta/Makefile  Tue Oct  2 13:49:03 2001
-+++ ocaml-3.04-/camlp4/ocaml_src/meta/Makefile Thu Jan 31 17:18:39 2002
+diff -ur ocaml-3.05/camlp4/ocaml_src/meta/Makefile ocaml-3.05-/camlp4/ocaml_src/meta/Makefile
+--- ocaml-3.05/camlp4/ocaml_src/meta/Makefile  Fri Jul 19 16:53:53 2002
++++ ocaml-3.05-/camlp4/ocaml_src/meta/Makefile Thu Aug  8 13:19:37 2002
 @@ -2,7 +2,7 @@
  
  include ../../config/Makefile
  
 -INCLUDES=-I ../camlp4 -I ../../boot -I $(OTOP)/utils
 +INCLUDES=-I ../camlp4 -I ../../boot -I $(OTOP)/utils -I $(OTOP)/parsing
- OCAMLCFLAGS=$(INCLUDES)
+ OCAMLCFLAGS=-warn-error A $(INCLUDES)
  OBJS=q_MLast.cmo pa_r.cmo pa_rp.cmo pa_extend.cmo pa_extend_m.cmo pa_ifdef.cmo pr_dump.cmo
  CAMLP4RM=pa_r.cmo pa_rp.cmo pr_dump.cmo
+--- ocaml-3.08.3/configure.orig        2005-04-29 22:58:18.000000000 +0200
++++ ocaml-3.08.3/configure     2005-04-29 23:06:30.000000000 +0200
+@@ -1322,6 +1322,7 @@
+     8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;;
+     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
+     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
++    8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
+     *) echo "This version is not known."; has_tk=false ;;
+     esac
+   else