[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0_beta2-1-5-g3034a75

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit f98f73418c28e684ca7441d561d47ce7e51b6edb
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 20 22:01:44 2012 +0200

    Fixes in PowerPC test suite

diff --git a/debian/patches/0014-ocamlopt-fix-on-powerpc.patch b/debian/patches/0014-ocamlopt-fix-on-powerpc.patch
new file mode 100644
index 0000000..212ed94
--- /dev/null
+++ b/debian/patches/0014-ocamlopt-fix-on-powerpc.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 20 Jun 2012 21:58:35 +0200
+Subject: ocamlopt fix on powerpc
+
+Origin: http://caml.inria.fr/cgi-bin/viewvc.cgi?view=revision&revision=12583
+---
+ asmcomp/power/arch.ml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/asmcomp/power/arch.ml b/asmcomp/power/arch.ml
+index 696073e..239390c 100644
+--- a/asmcomp/power/arch.ml
++++ b/asmcomp/power/arch.ml
+@@ -48,7 +48,7 @@ let size_float = 8
+ 
+ (* Behavior of division *)
+ 
+-let division_crashes_on_overflow = false
++let division_crashes_on_overflow = true
+ 
+ (* Operations on addressing modes *)
+ 
+-- 
diff --git a/debian/patches/0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch b/debian/patches/0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch
new file mode 100644
index 0000000..f42da1b
--- /dev/null
+++ b/debian/patches/0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch
@@ -0,0 +1,28 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 20 Jun 2012 22:00:46 +0200
+Subject: Move power.o rule in asmcomp test after definition of $(SYSTEM)
+
+---
+ testsuite/tests/asmcomp/Makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testsuite/tests/asmcomp/Makefile b/testsuite/tests/asmcomp/Makefile
+index fb1af49..c4d1aa0 100644
+--- a/testsuite/tests/asmcomp/Makefile
++++ b/testsuite/tests/asmcomp/Makefile
+@@ -141,11 +141,11 @@ clean: defaultclean
+ 	@rm -f parsecmm.ml parsecmm.mli lexcmm.ml
+ 	@rm -f $(CASES:=.s)
+ 
+-power.o: power-$(SYSTEM).o
+-	@cp power-$(SYSTEM).o power.o
+-
+ promote:
+ 
+ include $(BASEDIR)/makefiles/Makefile.common
+ 
++power.o: power-$(SYSTEM).o
++	@cp power-$(SYSTEM).o power.o
++
+ arch: $(ARCH).o
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 5bc804a..3df69c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@
 0011-Embed-bytecode-in-C-object-when-using-custom.patch
 0012-Fix-asmcomp-tests-on-Hurd.patch
 0013-Fix-testsuite-on-bytecode-architectures.patch
+0014-ocamlopt-fix-on-powerpc.patch
+0015-Move-power.o-rule-in-asmcomp-test-after-definition-o.patch

-- 
OCaml packaging