Bug#907441: asylum FTCBFS: uses the build architecture compiler

[Helmut Grohne]

Source: asylum
Version: 0.3.2-3
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

asylum fails to cross build from source, because it uses the build
architecture compiler. Usually, using dh_auto_build fixes this in
similar cases, but here doing so causes more warnings. asylum's Makefile
uses CC to store the C++ compiler and when dh_auto_build passes a C
cross compiler via CC, things go badly wrong. I suggest renaming the
variable to the standard variable CXX and doing that fixes the cross
build. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru asylum-0.3.2/debian/changelog asylum-0.3.2/debian/changelog
--- asylum-0.3.2/debian/changelog	2018-05-17 13:34:38.000000000 +0200
+++ asylum-0.3.2/debian/changelog	2018-08-27 21:40:59.000000000 +0200
@@ -1,3 +1,12 @@
+asylum (0.3.2-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Let dh_auto_build pass cross tools to make.
+    + cross.patch/Makefile: Use CXX for the C++ compiler.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 27 Aug 2018 21:40:59 +0200
+
 asylum (0.3.2-3) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru asylum-0.3.2/debian/patches/cross.patch asylum-0.3.2/debian/patches/cross.patch
--- asylum-0.3.2/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ asylum-0.3.2/debian/patches/cross.patch	2018-08-27 21:40:59.000000000 +0200
@@ -0,0 +1,20 @@
+--- asylum-0.3.2.orig/Makefile
++++ asylum-0.3.2/Makefile
+@@ -2,7 +2,7 @@
+ #HOST=mingw
+ #HOST=haiku
+ 
+-CC=g++
++CXX=g++
+ RM=rm
+ CFLAGS= -O3
+ COPTS=  $(CFLAGS) -funsigned-char \
+@@ -95,7 +95,7 @@
+ build: asylum$(EXE)
+ 
+ asylum$(EXE): $(SRCS) $(OS_SOURCE) asylum.h Makefile
+-	$(CC) $(COPTS) $(LDFLAGS) -o asylum$(EXE) $(SRCS) $(OS_SOURCE) $(LIBS)
++	$(CXX) $(COPTS) $(LDFLAGS) -o asylum$(EXE) $(SRCS) $(OS_SOURCE) $(LIBS)
+ 
+ clean:
+ 	$(RM) asylum$(EXE)
diff --minimal -Nru asylum-0.3.2/debian/patches/series asylum-0.3.2/debian/patches/series
--- asylum-0.3.2/debian/patches/series	2018-05-17 13:34:38.000000000 +0200
+++ asylum-0.3.2/debian/patches/series	2018-08-27 21:40:59.000000000 +0200
@@ -3,3 +3,4 @@
 0003-loadconfig-fix-scanf-buffer-overflow.patch
 0004-swi_blitz_hammerop-missing-fclose.patch
 0005-dropprivs-add-error-checking.patch
+cross.patch
diff --minimal -Nru asylum-0.3.2/debian/rules asylum-0.3.2/debian/rules
--- asylum-0.3.2/debian/rules	2018-05-17 13:34:38.000000000 +0200
+++ asylum-0.3.2/debian/rules	2018-08-27 21:40:56.000000000 +0200
@@ -7,7 +7,7 @@
 	dh $@
 
 override_dh_auto_build:
-	$(MAKE) CFLAGS="$(CFLAGS)"
+	dh_auto_build -- CFLAGS="$(CFLAGS)"
 
 override_dh_auto_install-arch:
 	$(MAKE) install-binary \