This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository frama-c.
commit 6e559bad09833cebb44683f54a7aab6ab1ef0973 Author: Mehdi Dogguy <me...@debian.org> Date: Sun Apr 27 14:14:16 2014 +0200 Pass --enabe-zarith to configure script of instead of patching. --- debian/changelog | 2 ++ .../0004-Fix-auto-detection-of-ocaml-zarith.patch | 29 ---------------------- debian/patches/series | 1 - debian/rules | 1 + 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9144df8..3eea36c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ frama-c (20140301+neon+dfsg-1) UNRELEASED; urgency=low - Remove 0005-Fix-compilation-with-OCaml-4.01.0.patch - Add 0005-Port-to-OCamlgraph-1.8.5.patch * Bump build-dependency of Ocamlgraph to 1.8.5~. + * Pass --enabe-zarith to configure script instead of patching it. + - Remove 0004-Fix-auto-detection-of-ocaml-zarith.patch. -- Mehdi Dogguy <me...@debian.org> Sun, 27 Apr 2014 13:16:04 +0200 diff --git a/debian/patches/0004-Fix-auto-detection-of-ocaml-zarith.patch b/debian/patches/0004-Fix-auto-detection-of-ocaml-zarith.patch deleted file mode 100644 index 6eb2926..0000000 --- a/debian/patches/0004-Fix-auto-detection-of-ocaml-zarith.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Mehdi Dogguy <me...@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 81acf76..a823905 100644 ---- a/configure.in -+++ b/configure.in -@@ -433,10 +433,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 - AC_CHECK_FILE($ZARITH_PATH/zarith.$LIB_SUFFIX,HAS_ZARITH=yes,HAS_ZARITH=no) - else - ZARITH_PATH=$($OCAMLFIND query zarith 2>/dev/null | tr -d '\r\n') --- diff --git a/debian/patches/series b/debian/patches/series index fb55382..4ce1bba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +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 0005-Port-to-OCamlgraph-1.8.5.patch diff --git a/debian/rules b/debian/rules index 1b77f07..65eb358 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,7 @@ override_dh_auto_configure: --disable-impact \ --disable-security \ --enable-verbosemake \ + --enable-zarith="$(OCAML_STDLIB_DIR)/zarith" \ CFLAGS="$(CFLAGS)" \ LDFLAGS="-Wl,-z,defs" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/frama-c.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits