[med-svn] [snap] 01/03: Extend use-CC.patch to cover all bare gcc invocations

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository snap.

commit 306865104dd9a358864c5b2119da6eedb1e157b3
Author: Andreas Tille <tille at debian.org>
Date:   Sat Dec 9 07:31:51 2017 +0100

    Extend use-CC.patch to cover all bare gcc invocations
---
 debian/changelog            |  8 ++++++++
 debian/patches/use-CC.patch | 38 ++++++++++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a6b611..67a191c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+snap (2013-11-29-8) UNRELEASED; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Extend use-CC.patch to cover all bare gcc invocations.
+    (Closes: #883891)
+
+ -- Andreas Tille <tille at debian.org>  Sat, 09 Dec 2017 07:30:50 +0100
+
 snap (2013-11-29-7) unstable; urgency=medium
 
   * Moved packaging from SVN to Git
diff --git a/debian/patches/use-CC.patch b/debian/patches/use-CC.patch
index 1f8b3a2..d44716c 100644
--- a/debian/patches/use-CC.patch
+++ b/debian/patches/use-CC.patch
@@ -1,10 +1,12 @@
-Author: Sascha Steinbiss <satta at tetrinetsucht.de>
-Last-Update: Sat, 30 Apr 2016 17:48:14 +0100
+Author: Sascha Steinbiss <satta at tetrinetsucht.de>,
+        Helmut Grohne <helmut at subdivi.de>
+Last-Update: Fri, 8 Dec 2017 22:32:22 +0100
+Bug-Debian: https://bugs.debian.org/883891
 Description: Do not force gcc explicitly but use $(CC) instead
 
 --- a/Zoe/Makefile
 +++ b/Zoe/Makefile
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ clean:
  	rm -f *.o $(APP) $(APP2) $(APP3) $(APP4) $(APP5)
  
  depend: $(OBJECTS:.o=.c)
@@ -13,7 +15,7 @@ Description: Do not force gcc explicitly but use $(CC) instead
  
  tar:
  	rm -rf /tmp/$(APP)
-@@ -92,14 +92,14 @@
+@@ -92,14 +92,14 @@ tar:
  #################
  
  gcc:
@@ -34,3 +36,31 @@ Description: Do not force gcc explicitly but use $(CC) instead
  
  
  ###################
+--- a/Makefile
++++ b/Makefile
+@@ -79,7 +79,7 @@ clean:
+ 	cd Zoe; make clean
+ 
+ depend: $(OBJECTS:.o=.c)
+-	gcc $(INC) -MM $^ > $@
++	$(CC) $(INC) -MM $^ > $@
+ 
+ tar:
+ 	rm -rf /tmp/$(APP)
+@@ -96,11 +96,11 @@ tar:
+ 
+ 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)"
+ 
+ 
+ ###################

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/snap.git