r38176 - in /packages/gmp/trunk/debian: changelog rules

[smr at users.alioth.debian.org]

Author: smr
Date: Sun Mar 13 19:28:51 2011
New Revision: 38176

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38176
Log:
Apply patch from Steve Langaseek to fix cross-build issue.

Modified:
    packages/gmp/trunk/debian/changelog
    packages/gmp/trunk/debian/rules

Modified: packages/gmp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/changelog?rev=38176&op=diff
==============================================================================
--- packages/gmp/trunk/debian/changelog (original)
+++ packages/gmp/trunk/debian/changelog Sun Mar 13 19:28:51 2011
@@ -1,3 +1,18 @@
+gmp (2:5.0.1+dfsg-7) UNRELEASED; urgency=low
+
+  [ Peter Pearse ]
+  * For cross builds, strip GNU_TYPES & pass --target.  Closes: #605038.
+
+  [ Steve Langasek ]
+  * We don't need to use $(strip), just avoid having whitespace in the first
+    place.
+  * For that matter, this s/i386/i486/ substitution is entirely unnecessary
+    to begin with; the DEB_HOST_GNU_TYPE is already i486 on Debian, and i686
+    on Ubuntu.  So as long as we're modifying this line, let's simplify it
+    some more.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 13 Mar 2011 14:26:32 -0500
+
 gmp (2:5.0.1+dfsg-6) unstable; urgency=low
 
   * control: libgmp10-dev provides the old libgmp3-dev package.  This is a

Modified: packages/gmp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/rules?rev=38176&op=diff
==============================================================================
--- packages/gmp/trunk/debian/rules (original)
+++ packages/gmp/trunk/debian/rules Sun Mar 13 19:28:51 2011
@@ -16,8 +16,8 @@
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-export DEB_HOST_GNU_TYPE  := $(subst i386,i486, $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
-export DEB_BUILD_GNU_TYPE := $(subst i386,i486, $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE))
+export DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 MAKE_CHECK = : disabled make check
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -56,7 +56,7 @@
   confflags_build += --build $(DEB_BUILD_GNU_TYPE)
 else
   AR = $(DEB_HOST_GNU_TYPE)-ar
-  confflags_build += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+  confflags_build += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --target $(DEB_HOST_GNU_TYPE)
 endif
 
 ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 ppc64 kfreebsd-amd64))