[Build-common-hackers] Bug#450483: Bug#450483: Bug#450483: cdbs: Stop setting DEB_CONFIGURE_SCRIPT_ENV in order to enable cross-building

[Peter Eisentraut]

Neil Williams wrote:
> I need CDBS to NOT set CC - that is the sum of it.

I think what you need is something like this:

Index: 1/class/autotools-vars.mk.in
===================================================================
--- 1/class/autotools-vars.mk.in        (Revision 175)
+++ 1/class/autotools-vars.mk.in        (Arbeitskopie)
@@ -31,7 +31,13 @@
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)

 DEB_CONFIGURE_SCRIPT = $(CURDIR)/$(DEB_SRCDIR)/configure
-DEB_CONFIGURE_SCRIPT_ENV = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+DEB_CONFIGURE_SCRIPT_ENV = CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+ifdef CC
+DEB_CONFIGURE_SCRIPT_ENV += CC="$(CC)"
+endif
+ifdef CXX
+DEB_CONFIGURE_SCRIPT_ENV += CXX="$(CXX)"
+endif
 DEB_CONFIGURE_NORMAL_ARGS = --build=$(DEB_BUILD_GNU_TYPE) --prefix=$(DEB_CONFIGURE_PREFIX) --includedir=$(DEB_CONFIGURE_INCLUDEDIR) --mandir=$(DEB_CONFIGURE_MANDIR) --infodir=$(DEB_CONFIGURE_INFODIR) --sysconfdir=$(DEB_CONFIGURE_SYSCONFDIR) --localstatedir=$(DEB_CONFIGURE_LOCALSTATEDIR) --libexecdir=$(DEB_CONFIGURE_LIBEXECDIR) --disable-maintainer-mode --disable-dependency-tracking

 # Provide --host only if different from --build, as recommended in