Use DEB_BUILD_GNU_TYPE instead of relying on "uname -m" (Closes: #689517). Thanks...

diff --git a/debian/changelog b/debian/changelog
index 28b60435b0b1e1aaf653887e025ea3d8044660af..d00cb129b50c36dd693472b2ec4bde9fcfb34aa3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 ocaml (3.12.1-5) UNRELEASED; urgency=low
 
+  [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
+  [ Mehdi Dogguy ]
+  * Use DEB_BUILD_GNU_TYPE instead of relying on "uname -m" (Closes: #689517).
+    Thanks to Konstantinos Margaritis for the patch.
+
  -- Sylvain Le Gall <gildor@debian.org>  Fri, 21 Sep 2012 01:20:13 +0000
 
 ocaml (3.12.1-4) unstable; urgency=low

diff --git a/debian/rules b/debian/rules
index 3da32e6eb12fc76c503279b45f83fc7c3e62989d..a29a23a321a0d8ec4498ee794e234e5ac3d952ef 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ OCAML_STDLIB_DIR := /usr/lib/ocaml
 OCAML_NATIVE_ARCHS := $(shell cat debian/native-archs)
 OCAML_NATDYNLINK_ARCHS := $(shell cat debian/natdynlink-archs)
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 OCAML_OPT_ARCH := $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS))
 OCAML_HAVE_OCAMLOPT := $(if $(OCAML_OPT_ARCH),yes,no)
 OCAML_OCAMLDOC_DESTDIR_HTML =
@@ -54,6 +55,7 @@ export OCAML_OPT_ARCH
 export OCAML_STDLIB_DIR
 
 CONFIGURE_OPTS := \
+  --host $(DEB_BUILD_GNU_TYPE)\
   --with-pthread -prefix /usr \
   -libdir $(OCAML_STDLIB_DIR) \
   -x11lib "$(shell pkg-config --variable=libdir x11)" \