Bug#1128791: flobopuyo FTCBFS: wrong compiler choice

[Helmut Grohne]

Source: flobopuyo
Version: 0.20-7
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

Hi Alexandre at al,

thanks for your work on removing cdbs. For this package, it provides the
foundation to cross building, but does not fix it all the way. The
upstream build system both hard codes "g++" and uses CC=g++. The former
needs to become substitutable and the latter needs support from
debian/rules, because otherwise debhelper subtitutes a C compiler where
a C++ compiler is needed. I'm attaching a patch addressing both aspects.

Helmut
-------------- next part --------------
diff -Nru flobopuyo-0.20/debian/changelog flobopuyo-0.20/debian/changelog
--- flobopuyo-0.20/debian/changelog	2026-01-18 12:53:32.000000000 +0100
+++ flobopuyo-0.20/debian/changelog	2026-02-22 07:44:51.000000000 +0100
@@ -1,3 +1,12 @@
+flobopuyo (0.20-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + cross.patch: Make g++ substitutable.
+    + Upstream requires CC to be a C++ compiler.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 22 Feb 2026 07:44:51 +0100
+
 flobopuyo (0.20-7) unstable; urgency=medium
 
   * Team upload.
diff -Nru flobopuyo-0.20/debian/patches/cross.patch flobopuyo-0.20/debian/patches/cross.patch
--- flobopuyo-0.20/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ flobopuyo-0.20/debian/patches/cross.patch	2026-02-22 07:44:51.000000000 +0100
@@ -0,0 +1,20 @@
+--- flobopuyo-0.20.orig/Makefile
++++ flobopuyo-0.20/Makefile
+@@ -109,7 +109,7 @@
+ all: prelude flobopuyo
+ 
+ flobopuyo: ${OBJFILES}
+-	g++ $(CFLAGS) $(CXXFLAGS) -o flobopuyo ${OBJFILES} -lSDL_mixer -lSDL_image -lSDL $(LDFLAGS)
++	$(CXX) $(CFLAGS) $(CXXFLAGS) -o flobopuyo ${OBJFILES} -lSDL_mixer -lSDL_image -lSDL $(LDFLAGS)
+ 	@echo
+ 	@echo " Type ./flobopuyo to play."
+ 	@echo "--------------------------------------"
+@@ -186,7 +186,7 @@
+ 	chmod a+rx ${INSTALL_BINDIR}/flobopuyo
+ 
+ flobopuyo-static: prelude  ${OBJFILES}
+-	@echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
++	@echo "[flobopuyo-static]" && $(CXX) $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
+         /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a /sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs`
+ 	@echo "--------------------------------------"
+ 	@echo " Compilation finished"
diff -Nru flobopuyo-0.20/debian/patches/series flobopuyo-0.20/debian/patches/series
--- flobopuyo-0.20/debian/patches/series	2026-01-18 11:47:10.000000000 +0100
+++ flobopuyo-0.20/debian/patches/series	2026-02-22 07:44:51.000000000 +0100
@@ -6,3 +6,4 @@
 60_set_window_title.patch
 70_fix_binutils_gold_error.patch
 80_fix_typo.patch
+cross.patch
diff -Nru flobopuyo-0.20/debian/rules flobopuyo-0.20/debian/rules
--- flobopuyo-0.20/debian/rules	2026-01-18 11:52:49.000000000 +0100
+++ flobopuyo-0.20/debian/rules	2026-02-22 07:44:50.000000000 +0100
@@ -1,10 +1,14 @@
 #!/usr/bin/make -f
 
 export DEB_CFLAGS_MAINT_APPEND = -DUSE_AUDIO=1
+include /usr/share/dpkg/buildtools.mk
 
 %:
 	dh $@
 
+override_dh_auto_build:
+	dh_auto_build -- 'CC=$(CXX)'
+
 execute_after_dh_install:
 	# Remove ._bi crap to silence lintian.
 	rm -f debian/flobopuyo/usr/share/games/flobopuyo/sfx/._bi