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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9e0d8fd1db059013adcb7795e955102438de858f
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Apr 17 15:29:08 2011 +0200

    Natdynlink works on hurd-i386

diff --git a/debian/changelog b/debian/changelog
index a414545..d4ceb83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (3.12.0-3) UNRELEASED; urgency=low
+
+  * Patch configure script so that hurd-i386 is also recognized as a
+    natdynlink architecture (fixes FTBFS)
+
+ -- Stéphane Glondu <glondu at debian.org>  Sun, 17 Apr 2011 15:28:35 +0200
+
 ocaml (3.12.0-2) unstable; urgency=low
 
   * Patch configure script so that powerpc is recognized as a natdynlink
diff --git a/debian/patches/0009-Natdynlink-works-on-powerpc-and-hurd-i386.patch b/debian/patches/0009-Natdynlink-works-on-powerpc-and-hurd-i386.patch
new file mode 100644
index 0000000..6b28f40
--- /dev/null
+++ b/debian/patches/0009-Natdynlink-works-on-powerpc-and-hurd-i386.patch
@@ -0,0 +1,36 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 16 Apr 2011 23:41:23 +0200
+Subject: Natdynlink works on powerpc and hurd-i386
+
+Rationale: ssreflect used to work with natdynlink on powerpc and hurd
+with ocaml 3.11.2 / coq 8.2...
+
+Note: there is no native compiler for powerpc64! This must be a
+typo...
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ configure |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 7a34621..32e8d2e 100755
+--- a/configure
++++ b/configure
+@@ -619,13 +619,14 @@ if test $withsharedlibs = "yes"; then
+   case "$host" in
+     *-*-cygwin*)                  natdynlink=true;;
+     i[3456]86-*-linux*)           natdynlink=true;;
++    i[3456]86-*-gnu*)             natdynlink=true;;
+     x86_64-*-linux*)              natdynlink=true;;
+     i[3456]86-*-darwin10.*)
+       if test $arch64 == true; 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/0009-Natdynlink-works-on-powerpc.patch b/debian/patches/0009-Natdynlink-works-on-powerpc.patch
deleted file mode 100644
index 25cf206..0000000
--- a/debian/patches/0009-Natdynlink-works-on-powerpc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 b20456c..3a5c58c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +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
+0009-Natdynlink-works-on-powerpc-and-hurd-i386.patch

-- 
OCaml packaging