Merge pull request ocaml#70 from avsm/ocaml4-compile

fix compile under OCaml-4.00 by removing ExtHashtbl from extlib
OCamlPro · Aug 2, 2012 · e3a13a1 · e3a13a1
2 parents bb89d99 + c6a4aa4
commit e3a13a1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src_ext/Makefile b/src_ext/Makefile
@@ -33,6 +33,7 @@ ocaml-re.tar.gz:
 extlib.stamp: extlib-1.5.2.tar.gz
 	tar xfz extlib-1.5.2.tar.gz
 	mv extlib-1.5.2 extlib
+	cd extlib && patch -i ../extlib.patch -p1
 	@touch $@
 
 dose.stamp: dose.tar.gz

diff --git a/src_ext/depends.ocp.boot b/src_ext/depends.ocp.boot
@@ -16,7 +16,6 @@ begin library "extlib"
      "extlib/extString.ml"
      "extlib/extList.ml"
      "extlib/extLib.ml"
-     "extlib/extHashtbl.ml"
      "extlib/extArray.ml"
      "extlib/enum.ml"
      "extlib/dynArray.ml"
@@ -192,4 +191,4 @@ begin program "cnftocudf"
   requires = [ "dose" ]
 end
 
-*)
+*)
diff --git a/src_ext/extlib.patch b/src_ext/extlib.patch
@@ -0,0 +1,12 @@
+diff -ur extlib.a/extLib.ml extlib.b/extLib.ml
+--- extlib.a/extLib.ml	2011-08-06 15:56:39.000000000 +0100
++++ extlib.b/extLib.ml	2012-08-02 17:44:07.000000000 +0100
+@@ -35,7 +35,7 @@
+
+ module List = ExtList.List
+ module String = ExtString.String
+-module Hashtbl = ExtHashtbl.Hashtbl
++module Hashtbl = Hashtbl
+ module Array = ExtArray.Array
+
+ exception Invalid_string = ExtString.Invalid_string