[coq] Add patch to adapt to new camlp5 version.

Jerry James jjames at fedoraproject.org
Wed Jun 13 23:21:38 UTC 2012


commit 7168e08ef3a132244ba63a93bf43384b600cceeb
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Jun 13 17:21:13 2012 -0600

    Add patch to adapt to new camlp5 version.

 coq-camlp5.patch |   11 +++++++++++
 coq.spec         |    4 ++++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/coq-camlp5.patch b/coq-camlp5.patch
new file mode 100644
index 0000000..4b3fed6
--- /dev/null
+++ b/coq-camlp5.patch
@@ -0,0 +1,11 @@
+--- ./scripts/coqmktop.ml.orig	2011-11-06 04:59:10.000000000 -0700
++++ ./scripts/coqmktop.ml	2012-06-13 17:18:45.386268250 -0600
+@@ -33,7 +33,7 @@ let ide       = split_list Tolink.ide
+ (* 3. Toplevel objects *)
+ let camlp4topobjs =
+   if Coq_config.camlp4 = "camlp5" then
+-    ["camlp5_top.cma"; "pa_o.cmo"; "pa_extend.cmo"]
++    ["camlp5_top.cma"; "camlp5o.cma"; "pa_o.cmo"; "pa_extend.cmo"]
+   else
+     ["camlp4_top.cma"; "pa_o.cmo"; "pa_op.cmo"; "pa_extend.cmo"]
+ let topobjs = camlp4topobjs
diff --git a/coq.spec b/coq.spec
index 52642b3..450e338 100644
--- a/coq.spec
+++ b/coq.spec
@@ -36,6 +36,9 @@ Source2:        README.coq-emacs
 Source3:        README.coq-xemacs
 Source4:        coq.xml
 
+# Adapt to new camlp5 version
+Patch0:         %{name}-camlp5.patch
+
 BuildRequires:  ocaml, ocaml-camlp5-devel, ocaml-lablgtk-devel
 BuildRequires:  desktop-file-utils, emacs-nox, xemacs-nox
 BuildRequires:  emacs-proofgeneral, xemacs-proofgeneral
@@ -139,6 +142,7 @@ This package is not needed to use the XEmacs interface.
 
 %prep
 %setup -q
+%patch0
 
 # Fix some files that are not in UTF-8 encoding
 


More information about the scm-commits mailing list