[Pkg-ocaml-maint-commits] [SCM] ocaml-zarith packaging branch, master, updated. debian/1.0-1-3-g8010404

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 0890a3c8d8baa27959c2caaabc522eedc33d5620
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Oct 5 09:02:55 2011 +0200

    Add some arch-triplets in configure script

diff --git a/debian/changelog b/debian/changelog
index 1b7d13e..f525514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ ocaml-zarith (1.0-2) UNRELEASED; urgency=low
   * Make ocamlopt's presence optional. This should prevent build failures
     on bytecode only architectures.
     - Add 0005-ocamlopt-is-not-really-required.patch
+  * kfreebsd-amd64 and kfreebsd-i386 are also (resp.) amd64 and i386. Add
+    some arch-triplets in configure script.
+    - Add 0006-Detect-more-arch-triplets.patch
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sun, 02 Oct 2011 11:53:38 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 05 Oct 2011 09:01:29 +0200
 
 ocaml-zarith (1.0-1) experimental; urgency=low
 
diff --git a/debian/patches/0006-Detect-more-arch-triplets.patch b/debian/patches/0006-Detect-more-arch-triplets.patch
new file mode 100644
index 0000000..6086b85
--- /dev/null
+++ b/debian/patches/0006-Detect-more-arch-triplets.patch
@@ -0,0 +1,26 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Wed, 5 Oct 2011 09:01:14 +0200
+Subject: [PATCH] Detect more arch-triplets
+
+---
+ configure |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 980aedd..092fc2b 100755
+--- a/configure
++++ b/configure
+@@ -255,10 +255,10 @@ fi
+ 
+ arch='none'
+ case $host in
+-    x86_64-*linux-gnu)
++    x86_64-*linux-gnu|x86_64-kfreebsd-gnu)
+         ccdef="-DZ_ELF $ccdef"
+         arch='x86_64';;
+-    i686-*linux-gnu)
++    i486-*linux-gnu|i686-*linux-gnu|i486-kfreebsd-gnu)
+         ccdef="-DZ_ELF $ccdef"
+         arch='i686';;
+     i686-*cygwin)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index dedf398..d31a133 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Make-it-byte-arch-aware.patch
 0004-Disable-charset-when-calling-ocamldoc.patch
 0005-ocamlopt-is-not-really-required.patch
+0006-Detect-more-arch-triplets.patch

-- 
ocaml-zarith packaging