[Pkg-ocaml-maint-commits] [frama-c] 03/05: Add 0004-Fix-auto-detection-of-ocaml-zarith.patch

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository frama-c.

commit e2d5644236ef7fc28de09fa6c4ca9d2b66f2f7b9
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Nov 25 11:49:37 2013 +0100

    Add 0004-Fix-auto-detection-of-ocaml-zarith.patch
---
 debian/changelog                                   |  1 +
 .../0004-Fix-auto-detection-of-ocaml-zarith.patch  | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7c44411..1372c92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ frama-c (20130601+fluorine3+dfsg-1) UNRELEASED; urgency=low
       upstream
     - Remove 0002-Accept-ocamlgraph-1.8.patch, fixed upstream
     - Remove 0006-Patchlevel2-for-Nitrogen-20111001.patch, integrated
+    - Add 0004-Fix-auto-detection-of-ocaml-zarith.patch
     - Require ocamlgraph (>= 1.8.3~) on build.
   * Add libzarith-ocaml-dev to Build-Depends.
 
diff --git a/debian/patches/0004-Fix-auto-detection-of-ocaml-zarith.patch b/debian/patches/0004-Fix-auto-detection-of-ocaml-zarith.patch
new file mode 100644
index 0000000..e3147bb
--- /dev/null
+++ b/debian/patches/0004-Fix-auto-detection-of-ocaml-zarith.patch
@@ -0,0 +1,29 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Mon, 25 Nov 2013 11:47:18 +0100
+Subject: Fix auto-detection of ocaml-zarith
+
+The installation directory is the same using any upstream provided
+installation method (simple one or using ocamlfind). It is always:
+
+	$(ocamlc -where)/zarith/*
+---
+ configure.in |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 7af9655..58c9bb6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -364,10 +364,8 @@ AC_ARG_ENABLE(
+   ZARITH_PATH=$enableval,)
+ 
+ if test -z "$ZARITH_PATH"; then
+-  # standard installation procedure of zarith diverges according to 
+-  # ocamlfind installation (see zarith's README)
+   if test "$OCAMLFIND" = no ; then
+-  ZARITH_PATH=$OCAMLLIB
++  ZARITH_PATH=$OCAMLLIB/zarith
+   else
+   ZARITH_PATH=`ocamlfind printconf destdir | tr -d '\\r\\n'`/zarith
+   fi
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 06464b6..fff4336 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-spelling-error-in-binary.patch
 0002-Use-bin-cp-instead-of-usr-bin-install.patch
 0003-Disable-CHMOD_RO-invocations.patch
+0004-Fix-auto-detection-of-ocaml-zarith.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/frama-c.git