diff --git a/camlp5-typevar.patch b/camlp5-typevar.patch new file mode 100644 index 0000000..f7e75cc --- /dev/null +++ b/camlp5-typevar.patch @@ -0,0 +1,30 @@ +--- ./etc/pa_schemer.ml.orig 2012-10-08 04:09:25.000000000 -0600 ++++ ./etc/pa_schemer.ml 2012-10-17 16:41:24.782055116 -0600 +@@ -5,9 +5,9 @@ + open Pcaml; + open Exparser; + +-type choice α β = +- [ Left of α +- | Right of β ] ++type choice 'a 'b = ++ [ Left of 'a ++ | Right of 'b ] + ; + + (* Buffer *) +--- ./etc/pa_lispr.ml.orig 2012-10-08 04:09:25.000000000 -0600 ++++ ./etc/pa_lispr.ml 2012-10-17 16:41:41.275721761 -0600 +@@ -4,9 +4,9 @@ + + open Pcaml; + +-type choice α β = +- [ Left of α +- | Right of β ] ++type choice 'a 'b = ++ [ Left of 'a ++ | Right of 'b ] + ; + + (* Buffer *) diff --git a/ocaml-camlp5.spec b/ocaml-camlp5.spec index 3fe8945..a91936e 100644 --- a/ocaml-camlp5.spec +++ b/ocaml-camlp5.spec @@ -13,6 +13,8 @@ ExclusiveArch: %{ocaml_arches} Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz Source1: camlp5-META +# Not yet sent upstream: experimental patch to fix the build with OCaml 4.00.1 +Patch0: camlp5-typevar.patch BuildRequires: ocaml BuildRequires: ocaml-ocamldoc @@ -95,6 +97,7 @@ rm -f doc/html/.cvsignore doc/htmlp/{.cvsignore,*.sh,Makefile,html2*} %changelog * Wed Oct 17 2012 Jerry James - 6.07-1 - New upstream version 6.07 (provides OCaml 4.00.1 support) +- Add -typevar patch to fix the build * Sat Jul 28 2012 Richard W.M. Jones - 6.06-4 - Rebuild for OCaml 4.00.0 official release.