[frama-c] Patch configure script to detect OCaml 4.
Richard W.M. Jones
rjones at fedoraproject.org
Mon Jul 30 09:56:17 UTC 2012
commit b14db1aa94e47481b7ea9dcb7a4b35cd3e8c4bf1
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Jul 30 10:54:46 2012 +0100
Patch configure script to detect OCaml 4.
Note this is only a partial fix. There are still build problems
with this package.
configure-ocaml-4.patch | 11 +++++++++++
frama-c.spec | 7 +++++++
2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/configure-ocaml-4.patch b/configure-ocaml-4.patch
new file mode 100644
index 0000000..6522b9e
--- /dev/null
+++ b/configure-ocaml-4.patch
@@ -0,0 +1,11 @@
+--- frama-c-Nitrogen-20111001.old/configure.in 2011-10-10 09:40:09.000000000 +0100
++++ frama-c-Nitrogen-20111001/configure.in 2012-07-30 09:12:57.276551927 +0100
+@@ -118,7 +118,7 @@
+ fi
+ ;;
+ 3.10*) echo "${ECHO_T}good!";;
+- 3.1*) echo "${ECHO_T}good!"; OCAML_ANNOT_OPTION="-annot";;
++ 3.1*|4*) echo "${ECHO_T}good!"; OCAML_ANNOT_OPTION="-annot";;
+ *) echo "${ECHO_T}Incompatible version!"; exit 2;;
+ esac
+
diff --git a/frama-c.spec b/frama-c.spec
index e60371a..c556f4f 100644
--- a/frama-c.spec
+++ b/frama-c.spec
@@ -31,6 +31,10 @@ Source1: frama-c-1.6.licensing
Source2: %{name}-gui.desktop
Source3: acsl.el
+# Fix configure script to detect OCaml 4.00.0.
+Patch1: configure-ocaml-4.patch
+BuildRequires: autoconf
+
BuildRequires: alt-ergo
BuildRequires: coq
BuildRequires: desktop-file-utils
@@ -134,6 +138,9 @@ support.
%prep
%setup -q -n %{name}-%pkgversion
+%patch1 -p1
+autoconf
+
# Fix encodings
iconv -f iso-8859-1 -t utf8 man/frama-c.1 > man/frama-c.1.conv
touch -r man/frama-c.1 man/frama-c.1.conv
More information about the scm-commits
mailing list