diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-08-03 11:47:19 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-08-03 11:47:19 +0000 |
| commit | 08b9d3c686018ef825214e8947fd72de64fe1451 (patch) | |
| tree | 932ff80eaa556c1f0edb60a640e4b8e59340c650 /dev-ml | |
| parent | Version Bump, 330971 (diff) | |
| download | gentoo-2-08b9d3c686018ef825214e8947fd72de64fe1451.tar.gz gentoo-2-08b9d3c686018ef825214e8947fd72de64fe1451.tar.bz2 gentoo-2-08b9d3c686018ef825214e8947fd72de64fe1451.zip | |
fix build with ocaml 3.12
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/camlp5/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ml/camlp5/camlp5-5.14.ebuild | 6 | ||||
| -rw-r--r-- | dev-ml/camlp5/files/camlp5-5.14-ocaml312.patch | 18 |
3 files changed, 28 insertions, 2 deletions
diff --git a/dev-ml/camlp5/ChangeLog b/dev-ml/camlp5/ChangeLog index f3f3575bf764..6f060eb2853e 100644 --- a/dev-ml/camlp5/ChangeLog +++ b/dev-ml/camlp5/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/camlp5 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/ChangeLog,v 1.45 2010/07/11 12:45:09 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/ChangeLog,v 1.46 2010/08/03 11:47:18 aballier Exp $ + + 03 Aug 2010; Alexis Ballier <aballier@gentoo.org> camlp5-5.14.ebuild, + +files/camlp5-5.14-ocaml312.patch: + fix build with ocaml 3.12 11 Jul 2010; Christian Faulhammer <fauli@gentoo.org> camlp5-5.14.ebuild: stable x86, bug 324811 diff --git a/dev-ml/camlp5/camlp5-5.14.ebuild b/dev-ml/camlp5/camlp5-5.14.ebuild index c5997e695884..f56c839d3fd4 100644 --- a/dev-ml/camlp5/camlp5-5.14.ebuild +++ b/dev-ml/camlp5/camlp5-5.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/camlp5-5.14.ebuild,v 1.4 2010/07/11 12:45:09 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/camlp5-5.14.ebuild,v 1.5 2010/08/03 11:47:18 aballier Exp $ EAPI="2" @@ -18,6 +18,10 @@ IUSE="doc +ocamlopt" DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]" RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}/${P}-ocaml312.patch" +} + src_configure() { ./configure \ -prefix /usr \ diff --git a/dev-ml/camlp5/files/camlp5-5.14-ocaml312.patch b/dev-ml/camlp5/files/camlp5-5.14-ocaml312.patch new file mode 100644 index 000000000000..d83bd6583207 --- /dev/null +++ b/dev-ml/camlp5/files/camlp5-5.14-ocaml312.patch @@ -0,0 +1,18 @@ +Index: camlp5-5.14/ocaml_stuff/3.12.0/utils/warnings.mli +=================================================================== +--- camlp5-5.14.orig/ocaml_stuff/3.12.0/utils/warnings.mli ++++ camlp5-5.14/ocaml_stuff/3.12.0/utils/warnings.mli +@@ -44,6 +44,7 @@ type t = + | Unused_var_strict of string (* 27 *) + | Wildcard_arg_to_constant_constr (* 28 *) + | Eol_in_string (* 29 *) ++ | Duplicate_definitions of string * string * string * string (*30 *) + ;; + + val parse_options : bool -> string -> unit;; +@@ -61,3 +62,5 @@ val print : formatter -> t -> int;; + exception Errors of int;; + + val check_fatal : unit -> unit;; ++ ++val help_warnings: unit -> unit |