Source: zerofree
Version: 1.1.1-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

zerofree fails to cross build from source again. The CC assignment in my
original patch was simplified to "CC ?= ...". Given that CC, has a
builtin default of "cc", that line was ineffective. Now dh_auto_build
already passes the right CC, so removing it makes zerofree cross build.
Please consider applying the attached patch.

Helmut
diff --minimal -Nru zerofree-1.1.1/debian/changelog 
zerofree-1.1.1/debian/changelog
--- zerofree-1.1.1/debian/changelog     2018-03-15 12:50:56.000000000 +0100
+++ zerofree-1.1.1/debian/changelog     2018-11-18 19:18:34.000000000 +0100
@@ -1,3 +1,10 @@
+zerofree (1.1.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS again: Don't force CC=cc. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sun, 18 Nov 2018 19:18:34 +0100
+
 zerofree (1.1.1-1) unstable; urgency=low
 
   * Bug fix: "new upstream version", thanks to Christoph Anton Mitterer
diff --minimal -Nru zerofree-1.1.1/debian/rules zerofree-1.1.1/debian/rules
--- zerofree-1.1.1/debian/rules 2018-03-15 12:32:20.000000000 +0100
+++ zerofree-1.1.1/debian/rules 2018-11-18 19:18:32.000000000 +0100
@@ -7,12 +7,9 @@
 # define DEB_HOST_GNU_TYPE also when calling debian/rules manually
 include /usr/share/dpkg/architecture.mk
 
-# use correct cross-compiler by default
-CC ?= $(DEB_HOST_GNU_TYPE)-gcc
-
 %:
        dh $@
 
 override_dh_auto_build:
-       dh_auto_build -- CC=$(CC) CFLAGS="$(CFLAGS) $(LDFLAGS) $(CPPFLAGS)"
+       dh_auto_build -- CFLAGS="$(CFLAGS) $(LDFLAGS) $(CPPFLAGS)"
        docbook-to-man debian/zerofree.sgml > zerofree.8

Reply via email to