[Pkg-ocaml-maint-commits] [SCM] ocaml-extunix packaging branch, master, updated. debian/0.0.4-2-9-g5191a0e

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 0023220e72bdca680d4ac1939f955ad031103f09
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jun 27 12:41:53 2012 +0200

    Use --disable-execinfo to disable execinfo test on arm* and powerpc.

diff --git a/debian/changelog b/debian/changelog
index b544966..0a78ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ocaml-extunix (0.0.5-1) UNRELEASED; urgency=low
     - remove 0001-Add-possibility-to-disable-execinfo-test-through-env.patch.
       Upstream now provides a way to disable some tests.
   * Enable tests explicitly during confidure phase using --enable-tests.
+  * Use --disable-execinfo to disable execinfo test on arm* and powerpc.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Wed, 27 Jun 2012 12:31:01 +0200
 
diff --git a/debian/rules b/debian/rules
index f3612a8..809ce1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,6 @@ export OCAMLFIND_DESTDIR
 OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
-ifneq (,$(findstring $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),arm powerpc))
-   export DISABLE_EXECINFO=1
-endif
-
 %:
 	dh --with ocaml $@
 
@@ -35,7 +31,11 @@ override_dh_auto_build:
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
+ifneq (,$(findstring $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),arm powerpc))
+	ocaml setup.ml -test --disable-execinfo
+else
 	ocaml setup.ml -test
+endif
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:

-- 
ocaml-extunix packaging