summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/extlib')
-rw-r--r--dev-ml/extlib/ChangeLog6
-rw-r--r--dev-ml/extlib/extlib-1.5.2.ebuild6
-rw-r--r--dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch17
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-ml/extlib/ChangeLog b/dev-ml/extlib/ChangeLog
index ad3d0cb9a109..5d4bab10cd44 100644
--- a/dev-ml/extlib/ChangeLog
+++ b/dev-ml/extlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ml/extlib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.16 2012/05/05 14:20:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/ChangeLog,v 1.17 2012/06/30 20:25:34 aballier Exp $
+
+ 30 Jun 2012; Alexis Ballier <aballier@gentoo.org> extlib-1.5.2.ebuild,
+ +files/extlib-1.5.2-ocaml4.patch:
+ add patch from upstream for compatibility with ocaml 4.00
05 May 2012; Alexis Ballier <aballier@gentoo.org> -extlib-1.5.1.ebuild:
remove old
diff --git a/dev-ml/extlib/extlib-1.5.2.ebuild b/dev-ml/extlib/extlib-1.5.2.ebuild
index 14f4b5bc7a46..16cc10d7a2f1 100644
--- a/dev-ml/extlib/extlib-1.5.2.ebuild
+++ b/dev-ml/extlib/extlib-1.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.2.ebuild,v 1.4 2012/03/08 11:46:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/extlib/extlib-1.5.2.ebuild,v 1.5 2012/06/30 20:25:34 aballier Exp $
EAPI="2"
@@ -16,6 +16,10 @@ SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc +ocamlopt"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-ocaml4.patch"
+}
+
src_compile() {
emake all || die "failed to build"
if use ocamlopt; then
diff --git a/dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch b/dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch
new file mode 100644
index 000000000000..81c519b7b10b
--- /dev/null
+++ b/dev-ml/extlib/files/extlib-1.5.2-ocaml4.patch
@@ -0,0 +1,17 @@
+Fixes ocaml 4 compatibility.
+
+From upstream:
+svn diff http://ocaml-extlib.googlecode.com/svn/trunk/ -c 396
+
+Index: extlib/extHashtbl.ml
+===================================================================
+--- extlib/extHashtbl.ml (revision 395)
++++ extlib/extHashtbl.ml (revision 396)
+@@ -32,6 +32,7 @@
+ }
+
+ include Hashtbl
++ let create n = Hashtbl.create (* no seed *) n
+
+ external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
+ external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"