The following commit has been merged in the master branch:
commit e30fed4dc2a3257f584db733e093ba2dc407170e
Author: Mehdi Dogguy
Date: Wed Jun 27 14:47:07 2012 +0200
Revert "Use --disable-execinfo to disable execinfo test on arm* and
powerpc."
This reverts commit 0023220e72bdca680d4ac1939f955ad031103f09
and partly 252b4fab09f2af57e44fc2c9594af5a96e2101c9
diff --git a/debian/changelog b/debian/changelog
index 96c0ecb..6faa658 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocaml-extunix (0.0.5-2) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Revert the following changes:
+- Use --disable-execinfo to disable execinfo test on arm* and powerpc.
+- remove 0001-Add-possibility-to-disable-execinfo-test-through-env.patch
+
+ -- Mehdi Dogguy Wed, 27 Jun 2012 14:38:50 +0200
+
ocaml-extunix (0.0.5-1) unstable; urgency=low
* Team upload.
diff --git
a/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
new file mode 100644
index 000..a0b32ea
--- /dev/null
+++
b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
@@ -0,0 +1,49 @@
+From: Stephane Glondu
+Date: Thu, 25 Aug 2011 09:14:40 +0200
+Subject: Add possibility to disable execinfo test through environment
+
+It fails on armel because of [1] and on powerpc because of [2].
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637360
+[2] http://caml.inria.fr/mantis/view.php?id=5334
+
+Forwarded: not-needed
+Signed-off-by: Stephane Glondu
+---
+ test/test.ml |9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/test/test.ml b/test/test.ml
+index 4bc468e..0d7ea8c 100644
+--- a/test/test.ml
b/test/test.ml
+@@ -495,7 +495,7 @@ let () =
+ let wrap test =
+ with_unix_error (fun () -> test (); Gc.compact ())
+ in
+- let tests = ("tests" >::: [
++ let tests = ("tests" >::: ([
+ "eventfd" >:: test_eventfd;
+ "uname" >:: test_uname;
+ "fadvise" >:: test_fadvise;
+@@ -506,7 +506,10 @@ let () =
+ "resource" >::: test_resource;
+ "strtime" >:: test_strtime;
+ "pts" >:: test_pts;
+-"execinfo" >:: test_execinfo;
++ ] @ (
++try let _ = Sys.getenv "DISABLE_EXECINFO" in []
++with Not_found -> ["execinfo" >:: test_execinfo]
++ ) @ [
+ "statvfs" >:: test_statvfs;
+ "setenv" >:: test_setenv;
+ "mkdtemp" >:: test_mkdtemp;
+@@ -522,6 +525,6 @@ let () =
+ "mkstemp" >:: test_mkstemp;
+ "mkostemp" >:: test_mkostemp;
+ "memalign" >:: test_memalign;
+-]) in
++])) in
+ ignore (run_test_tt_main (test_decorate wrap tests))
+
+--
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..9d3591a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-possibility-to-disable-execinfo-test-through-env.patch
diff --git a/debian/rules b/debian/rules
index 809ce1f..f3612a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ 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 $@
@@ -31,11 +35,7 @@ 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
___
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
