Control: tags -1 + patch

Hi Samuel,

On Sun, Feb 28, 2016 at 03:04:23PM +0100, Samuel Thibault wrote:
> startpar can be fixed to cross-build fine, please see attached patch
> which defines CC as appropriate.

Your patch has two little problems.
 * It relies on building under dpkg-buildpackage. Policy still allows
   building by invoking ./debian/rules directly and then
   DEB_HOST_GNU_TYPE may be unset.
 * Your patch unconditionally overwrites CC and thus breaks e.g.
   CC=clang dpkg-buildpackage. Note that since CC has a built-in
   default, CC ?= ... cannot be used.

I am attaching an updated version that addresses both issues.

Helmut
diff --minimal -Nru startpar-0.59/debian/rules startpar-0.59/debian/rules
--- startpar-0.59/debian/rules
+++ startpar-0.59/debian/rules
@@ -7,14 +7,19 @@
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+ifeq ($(origin CC),default)
+CC := $(DEB_HOST_GNU_TYPE)-gcc
+endif
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	$(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" $(CROSS) startpar check
+	$(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" CC=$(CC) startpar check
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	$(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" $(CROSS) startpar-upstart-inject
+	$(MAKE) EXTRACPPFLAGS="$(CPPFLAGS)" EXTRACFLAGS="$(CFLAGS)" EXTRALDFLAGS="$(LDFLAGS)" CC=$(CC) startpar-upstart-inject
 endif
 
 override_dh_auto_install-arch:

Reply via email to