[pkg-cryptsetup-devel] Bug#811559: cryptsetup FTCBFS: builds askpass with build arch compiler

[Helmut Grohne]

Source: cryptsetup
Version: 2:1.7.0-2
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

Hi Jonas,

I also noticed that cryptsetup itself fails to cross build, as it just
invokes gcc for askpass. It needs to call the host architecture compiler
of course. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru cryptsetup-1.7.0/debian/changelog cryptsetup-1.7.0/debian/changelog
--- cryptsetup-1.7.0/debian/changelog
+++ cryptsetup-1.7.0/debian/changelog
@@ -1,3 +1,10 @@
+cryptsetup (2:1.7.0-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use host arch compiler for askpass as well. (closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 19 Jan 2016 21:14:31 +0100
+
 cryptsetup (2:1.7.0-2) unstable; urgency=medium
 
   [ Guilhem Moulin ]
diff --minimal -Nru cryptsetup-1.7.0/debian/rules cryptsetup-1.7.0/debian/rules
--- cryptsetup-1.7.0/debian/rules
+++ cryptsetup-1.7.0/debian/rules
@@ -22,6 +22,9 @@
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
+ifeq ($(origin CC),default)
+  CC := $(DEB_HOST_GNU_TYPE)-gcc
+endif
 
 # Export dpkg build flags
 DEB_CFLAGS_MAINT_APPEND = -Wall
@@ -74,8 +77,8 @@
 	# build upstream cryptsetup
 	$(MAKE)
 	# build askpass and passdev keyscripts
-	gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -pedantic -std=c99 debian/askpass.c -o debian/askpass
-	gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -pedantic -std=c99 debian/passdev.c -o debian/scripts/passdev
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -pedantic -std=c99 debian/askpass.c -o debian/askpass
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -pedantic -std=c99 debian/passdev.c -o debian/scripts/passdev
 
 build: build-indep build-arch