Permalink
Browse files

Merge branch 'master' of github.com:OCamlPro/opam

  • Loading branch information...
2 parents 2f28df3 + e3a13a1 commit d8b3e42fc9067ab47fe417039c20a6a47f737058 @tuong tuong committed Aug 3, 2012
Showing with 14 additions and 2 deletions.
  1. +1 −0 src_ext/Makefile
  2. +1 −2 src_ext/depends.ocp.boot
  3. +12 −0 src_ext/extlib.patch
View
1 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
View
3 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
-*)
+*)
View
12 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

0 comments on commit d8b3e42

Please sign in to comment.