[cduce] Add potential build fix for OCaml 4.02.
Richard W.M. Jones
rjones at fedoraproject.org
Fri Aug 1 17:07:41 UTC 2014
commit ef0bea73020cc91d83552c6197a0c028bd3e627d
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Fri Aug 1 18:07:23 2014 +0100
Add potential build fix for OCaml 4.02.
cduce.spec | 10 +++++++++-
cduce_ocaml_4.02.0.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/cduce.spec b/cduce.spec
index 0663e2c..a661b27 100644
--- a/cduce.spec
+++ b/cduce.spec
@@ -12,7 +12,7 @@
Name: cduce
Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Modern XML-oriented functional language
License: BSD
@@ -25,6 +25,9 @@ Source1: http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_
Source2: http://debian.glondu.net/debian/ocaml-3.12.0/pool/ocamlduce/ocamlduce_3.12.0.0.orig.tar.gz
%endif
+# Build fix for OCaml 4.02.
+Patch1: cduce_ocaml_4.02.0.patch
+
ExcludeArch: ppc64 s390 s390x sparc64
BuildRequires: ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -83,6 +86,8 @@ incorporates CDuce extensions for working with XML documents.
%setup -q -n %{name}-%{version} -T -D -a 2
%endif
+%patch1 -p1
+
./configure --prefix=%{_prefix} \
--bindir=%{_bindir} \
--mandir=%{_mandir} \
@@ -163,6 +168,9 @@ popd
%changelog
+* Fri Aug 01 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.0-2
+- Add potential build fix for OCaml 4.02.
+
* Wed Jul 23 2014 Richard W.M. Jones <rjones at redhat.com> - 0.6.0-1
- New upstream version 0.6.0.
- Rebuild for OCaml 4.02.0 beta.
diff --git a/cduce_ocaml_4.02.0.patch b/cduce_ocaml_4.02.0.patch
new file mode 100644
index 0000000..3a2003d
--- /dev/null
+++ b/cduce_ocaml_4.02.0.patch
@@ -0,0 +1,37 @@
+diff -uprNZ cduce-0.6.0/Makefile.distrib cduce-0.6.1/Makefile.distrib
+--- cduce-0.6.0/Makefile.distrib 2014-03-05 14:49:17.000000000 +0100
++++ cduce-0.6.1/Makefile.distrib 2014-08-01 18:15:14.606679963 +0200
+@@ -17,7 +17,7 @@ ifeq ($(NATIVE),true)
+ all: cduce_lib.cmxa
+ endif
+
+-PACKAGES = dynlink camlp4 ulex pcre num netstring
++PACKAGES = dynlink camlp4 camlp4.extend ulex pcre num netstring
+
+ # Call make with VERBOSE=true to get a trace of commands
+
+@@ -41,14 +41,14 @@ SYNTAX_PARSER = -syntax camlp4o $(SYNTAX
+ CAMLC_P = ocamlc -g
+ DEPEND_OCAMLDEP = misc/q_symbol.cmo
+ ifeq ($(PROFILE), true)
+- CAMLOPT_P = ocamlopt -p -inline 10000
++ CAMLOPT_P = ocamlopt -p -inline 100
+ ifeq ($(NATIVE), false)
+ CAMLC_P = ocamlcp -p a
+ SYNTAX_PARSER =
+ DEPEND_OCAMLDEP =
+ endif
+ else
+- CAMLOPT_P = ocamlopt -inline 10000
++ CAMLOPT_P = ocamlopt -inline 100
+ endif
+
+ OPT = -warn-error FPSXY
+diff -uprNZ cduce-0.6.0/parser/parser.ml cduce-0.6.1/parser/parser.ml
+--- cduce-0.6.0/parser/parser.ml 2014-03-05 14:49:17.000000000 +0100
++++ cduce-0.6.1/parser/parser.ml 2014-08-01 18:14:52.822680449 +0200
+@@ -1,4 +1,3 @@
+-#load "pa_extend.cmo";;
+
+ open Cduce_loc
+ (* let raise = Pervasives.raise *)
More information about the scm-commits
mailing list