- updated for 3.10.0

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

diff --git a/ocaml-build.patch b/ocaml-build.patch
index 5a16eca3d7e006030d802f5abf81211074a2478d..5e32db69a30baa517269c41465151100b7285546 100644 (file)
--- a/ocaml-build.patch
+++ b/ocaml-build.patch
@@ -1,24 +1,10 @@
-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=-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.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=-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