[Debian-med-packaging] Bug#883891: snap FTCBFS: uses the build architecture compiler gcc in some places

[Helmut Grohne]

Source: snap
Version: 2013-11-29-7
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

snap fails to cross build from source, because it still uses the build
architecture compiler (gcc) in some places. This issue is partially
fixed by use-CC.patch, but the patch misses some invocations. The
attached patch extends use-CC.patch to cover the rest and makes snap
cross build successfully. Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru snap-2013-11-29/debian/changelog snap-2013-11-29/debian/changelog
--- snap-2013-11-29/debian/changelog	2017-11-20 13:24:52.000000000 +0100
+++ snap-2013-11-29/debian/changelog	2017-12-08 22:28:20.000000000 +0100
@@ -1,3 +1,11 @@
+snap (2013-11-29-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Extend use-CC.patch to cover all bare gcc invocations.
+    (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Fri, 08 Dec 2017 22:28:20 +0100
+
 snap (2013-11-29-7) unstable; urgency=medium
 
   * Moved packaging from SVN to Git
diff --minimal -Nru snap-2013-11-29/debian/patches/use-CC.patch snap-2013-11-29/debian/patches/use-CC.patch
--- snap-2013-11-29/debian/patches/use-CC.patch	2017-11-20 13:24:52.000000000 +0100
+++ snap-2013-11-29/debian/patches/use-CC.patch	2017-12-08 22:28:19.000000000 +0100
@@ -30,6 +32,36 @@
 +	make $(APP2) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
 +	make $(APP3) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
 +	make $(APP4) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP5) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+ 
+ 
+ ###################
+Index: snap-2013-11-29/Makefile
+===================================================================
+--- snap-2013-11-29.orig/Makefile
++++ snap-2013-11-29/Makefile
+@@ -79,7 +79,7 @@
+ 	cd Zoe; make clean
+ 
+ depend: $(OBJECTS:.o=.c)
+-	gcc $(INC) -MM $^ > $@
++	$(CC) $(INC) -MM $^ > $@
+ 
+ tar:
+ 	rm -rf /tmp/$(APP)
+@@ -96,11 +96,11 @@
+ 
+ gcc:
+ 	cd Zoe; make CFLAGS="$(CFLAGS)";
+-	make $(APP)  CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+-	make $(APP2) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+-	make $(APP3) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+-	make $(APP4) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
+-	make $(APP5) CC="gcc" CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP2) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP3) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
++	make $(APP4) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"
 +	make $(APP5) CFLAGS="-O2 -Wall -Werror $(CFLAGS)"