[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.0-1-1-g4d33d62

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4d33d627654db8702463a706c8a37ec4fe0912b2
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Apr 16 23:44:07 2011 +0200

    Natdynlink works on powerpc (fixes FTBFS)

diff --git a/debian/changelog b/debian/changelog
index 05d29b2..a414545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (3.12.0-2) unstable; urgency=low
+
+  * Patch configure script so that powerpc is recognized as a natdynlink
+    architecture (fixes FTBFS)
+
+ -- Stéphane Glondu <glondu at debian.org>  Sat, 16 Apr 2011 23:44:33 +0200
+
 ocaml (3.12.0-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/patches/0009-Natdynlink-works-on-powerpc.patch b/debian/patches/0009-Natdynlink-works-on-powerpc.patch
new file mode 100644
index 0000000..25cf206
--- /dev/null
+++ b/debian/patches/0009-Natdynlink-works-on-powerpc.patch
@@ -0,0 +1,27 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 16 Apr 2011 23:41:23 +0200
+Subject: [PATCH] Natdynlink works on powerpc
+
+Rationale: ssreflect used to work with natdynlink on powerpc with
+ocaml 3.11.2 / coq 8.2... and there is no native compiler for
+powerpc64! This must be a typo...
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 7a34621..a744e94 100755
+--- a/configure
++++ b/configure
+@@ -625,7 +625,7 @@ if test $withsharedlibs = "yes"; then
+         natdynlink=true
+       fi;;
+     i[3456]86-*-darwin[89]*)      natdynlink=true;;
+-    powerpc64-*-linux*)           natdynlink=true;;
++    powerpc-*-linux*)           natdynlink=true;;
+     sparc-*-linux*)               natdynlink=true;;
+     i686-*-kfreebsd*)             natdynlink=true;;
+     x86_64-*-kfreebsd*)           natdynlink=true;;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 73ce439..b20456c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch
 0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
 0008-Embed-bytecode-in-C-object-when-using-custom.patch
+0009-Natdynlink-works-on-powerpc.patch

-- 
OCaml packaging