[pkg-db-devel] Bug#642509: db4.8: small piece (correct CC) missing for successful cross-building

[Colin Watson]

Package: db4.8
Version: 4.8.30-9
Severity: normal
Tags: patch
User: crossbuild at debian.org
Usertags: cross

Hi,

In version 4.8.30-4, you applied a cross-build patch from Steve
Langasek; thanks!  However, there's one small piece left; debian/rules
sets CC=gcc regardless of whether it's building natively or cross, which
means that an attempt to cross-build db4.8 actually produces objects
built for i386.  Simply tweaking CC when cross-building is enough to fix
this.  Would you apply this patch?

(I realise that you want db4.8 to go away, but it's still a
build-dependency of python2.6 and python2.7, which means that it still
shows up in many interesting cross-build chains.  db doesn't have this
particular problem, but has a different one; I'll need to investigate
that separately.)

  * Set CC appropriately when cross-compiling.

diff -Nru db4.8-4.8.30/debian/rules db4.8-4.8.30/debian/rules
--- db4.8-4.8.30/debian/rules	2011-06-28 09:24:46.000000000 +0100
+++ db4.8-4.8.30/debian/rules	2011-09-22 17:54:52.000000000 +0100
@@ -20,7 +20,12 @@
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" 
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" 
+else
+	CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CFLAGS="$(CFLAGS)"
+endif
+
 CONFIGURE_SWITCHES =    --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--localstatedir=/var \

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]