Source: simutrans
Version: 122.0-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

simutrans fails to cross build from source, because it uses the build
architecture pkg-config. While the upstream build system allows
substituting pkg-config, it does not do so in a standard way, which is
why dh_auto_build doesn't handle it already. The attached patch
implements it in simutrans' way. Please consider applying it.

Helmut
diff --minimal -Nru simutrans-122.0/debian/changelog 
simutrans-122.0/debian/changelog
--- simutrans-122.0/debian/changelog    2021-08-16 16:26:30.000000000 +0200
+++ simutrans-122.0/debian/changelog    2021-08-27 16:11:34.000000000 +0200
@@ -1,3 +1,10 @@
+simutrans (122.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the host architecture pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 27 Aug 2021 16:11:34 +0200
+
 simutrans (122.0-1) unstable; urgency=medium
 
   * Team upload.
diff --minimal -Nru simutrans-122.0/debian/rules simutrans-122.0/debian/rules
--- simutrans-122.0/debian/rules        2021-08-16 13:39:25.000000000 +0200
+++ simutrans-122.0/debian/rules        2021-08-27 16:11:34.000000000 +0200
@@ -8,6 +8,8 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+include /usr/share/dpkg/buildtools.mk
+
 export CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
 export CCFLAGS  = $(CFLAGS)
 export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
@@ -19,8 +21,8 @@
        dh $@
 
 override_dh_auto_build:
-       dh_auto_build
-       dh_auto_build --sourcedirectory=makeobj
+       dh_auto_build -- SDL2_CONFIG="$(PKG_CONFIG) sdl2"
+       dh_auto_build --sourcedirectory=makeobj -- PNG_CONFIG="$(PKG_CONFIG) 
libpng"
 
 override_dh_auto_clean:
        dh_quilt_patch

Reply via email to