Bug#1095250: frotz FTCBFS: upstream Makefile changes broke cross compilation

[Helmut Grohne]

Source: frotz
Version: 2.55+dfsg-1
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

frotz fails to cross build from source for two reasons. For one thing,
upstream renamed the variable PKG_CONFIG to PKGCONF_BIN and
dh_auto_build does not supply the latter. As a result, frotz uses the
build architecture pkgconf and fails finding many of the required
libraries. For another ux_defines.h is listed in .PHONY and thus rebuilt
on every invocation. This incurs a rebuild during make install, but
dh_auto_install does not pass cross tools to make install and hence the
wrong toolchain is being used there. I suspect upstream wants
ux_defines.h to always get rebuilt, but that runs counter to the general
idea of building during dh_auto_build. I'm not sure dropping it from
.PHONY is something acceptable upstream, but it is necessary on the
Debian side. I'm attaching a patch for your convenience.

Helmut
-------------- next part --------------
diff --minimal -Nru frotz-2.55+dfsg/debian/changelog frotz-2.55+dfsg/debian/changelog
--- frotz-2.55+dfsg/debian/changelog	2025-02-03 07:35:10.000000000 +0100
+++ frotz-2.55+dfsg/debian/changelog	2025-02-05 08:25:13.000000000 +0100
@@ -1,3 +1,13 @@
+frotz (2.55+dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Adapt to upstream rename PKG_CONFIG -> PKGCONF_BIN.
+    + cross.patch: Remove ux_defines.h from .PHONY to avoid rebuilding during
+      make install.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 05 Feb 2025 08:25:13 +0100
+
 frotz (2.55+dfsg-1) unstable; urgency=medium
 
   * New upstream release, obsoleting uint32.patch.
diff --minimal -Nru frotz-2.55+dfsg/debian/patches/cross.patch frotz-2.55+dfsg/debian/patches/cross.patch
--- frotz-2.55+dfsg/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ frotz-2.55+dfsg/debian/patches/cross.patch	2025-02-05 08:25:13.000000000 +0100
@@ -0,0 +1,9 @@
+--- frotz-2.55+dfsg.orig/src/curses/Makefile
++++ frotz-2.55+dfsg/src/curses/Makefile
+@@ -74,5 +74,5 @@
+ %.o: %.c $(DEFINES)
+ 	$(CC) $(CFLAGS) $(CURSES_CFLAGS) $(NO_SOUND) -fPIC -fpic -o $@ -c $<
+ 
+-.PHONY: clean $(DEFINES)
++.PHONY: clean
+ .DELETE_ON_ERROR:
diff --minimal -Nru frotz-2.55+dfsg/debian/patches/series frotz-2.55+dfsg/debian/patches/series
--- frotz-2.55+dfsg/debian/patches/series	2025-02-03 07:02:10.000000000 +0100
+++ frotz-2.55+dfsg/debian/patches/series	2025-02-05 08:25:13.000000000 +0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru frotz-2.55+dfsg/debian/rules frotz-2.55+dfsg/debian/rules
--- frotz-2.55+dfsg/debian/rules	2021-03-02 13:36:29.000000000 +0100
+++ frotz-2.55+dfsg/debian/rules	2025-02-05 08:25:13.000000000 +0100
@@ -5,13 +5,14 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+include /usr/share/dpkg/buildtools.mk
 include /usr/share/dpkg/buildflags.mk
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build -- BINDIR=/usr/games CFLAGS="$(CPPFLAGS) $(CFLAGS)" curses dumb sdl
+	dh_auto_build -- BINDIR=/usr/games CFLAGS="$(CPPFLAGS) $(CFLAGS)" curses dumb sdl PKGCONF_BIN='$(PKG_CONFIG)'
 
 override_dh_auto_install:
 	dh_auto_install -- BINDIR=/usr/games PREFIX=/usr install_frotz install_dfrotz install_sfrotz