Your message dated Sat, 05 Apr 2025 11:49:13 +0000
with message-id <[email protected]>
and subject line Bug#1079531: fixed in ezquake 3.6.6-1
has caused the Debian Bug report #1079531,
regarding ezquake FTCBFS: hard codes the build architecture pkg-config
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1079531: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1079531
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: ezquake
Version: 3.6.4-3
Tags: patch
User: [email protected]
Usertags: ftcbfs
ezquake fails to cross build from source, because the upstream Makefile
hard codes the build architecture pkg-config and thus fails to locate a
number of .pc files that are only requested for the host architecture by
Build-Depends. The recommended way is using the variable PKG_CONFIG and
thus allowing the substitution of a host-specific tool. Beyond this, the
Makefile also investigates uname and thereby misdetects CPU and SYS in a
cross build environment. I'm attaching a patch fixing both aspects.
Helmut
diff --minimal -Nru ezquake-3.6.4/debian/changelog
ezquake-3.6.4/debian/changelog
--- ezquake-3.6.4/debian/changelog 2024-01-15 05:26:53.000000000 +0100
+++ ezquake-3.6.4/debian/changelog 2024-08-24 11:54:08.000000000 +0200
@@ -1,3 +1,12 @@
+ezquake (3.6.4-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + cross.patch: Honour ${PKG_CONFIG}.
+ + Also pass CPU and SYS to make when cross building.
+
+ -- Helmut Grohne <[email protected]> Sat, 24 Aug 2024 11:54:08 +0200
+
ezquake (3.6.4-3) unstable; urgency=medium
* Fix 32-bit pointer conversion warning.
diff --minimal -Nru ezquake-3.6.4/debian/patches/cross.patch
ezquake-3.6.4/debian/patches/cross.patch
--- ezquake-3.6.4/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ ezquake-3.6.4/debian/patches/cross.patch 2024-08-24 11:54:06.000000000
+0200
@@ -0,0 +1,103 @@
+--- ezquake-3.6.4.orig/Makefile
++++ ezquake-3.6.4/Makefile
+@@ -27,6 +27,7 @@
+
+ LSYS := $(shell echo $(SYS) | tr A-Z a-z)
+ CC ?= gcc
++PKG_CONFIG ?= pkg-config
+ WINDRES ?= windres
+ STRIP ?= strip
+ RM ?= rm -f
+@@ -115,51 +116,51 @@
+ CFLAGS_c += $(ZLIB_CFLAGS)
+ LIBS_c += $(ZLIB_LIBS)
+
+-PCRE2_CFLAGS ?= $(shell pkg-config libpcre2-8 --cflags)
+-PCRE2_LIBS ?= $(shell pkg-config libpcre2-8 --libs)
++PCRE2_CFLAGS ?= $(shell $(PKG_CONFIG) libpcre2-8 --cflags)
++PCRE2_LIBS ?= $(shell $(PKG_CONFIG) libpcre2-8 --libs)
+ CFLAGS_c += $(PCRE2_CFLAGS) -DPCRE2_CODE_UNIT_WIDTH=8
+ LIBS_c += $(PCRE2_LIBS)
+
+-EXPAT_CFLAGS ?= $(shell pkg-config expat --cflags)
+-EXPAT_LIBS ?= $(shell pkg-config expat --libs)
++EXPAT_CFLAGS ?= $(shell $(PKG_CONFIG) expat --cflags)
++EXPAT_LIBS ?= $(shell $(PKG_CONFIG) expat --libs)
+ CFLAGS_c += $(EXPAT_CFLAGS)
+ LIBS_c += $(EXPAT_LIBS)
+
+-PNG_CFLAGS ?= $(shell pkg-config libpng --cflags) -DWITH_PNG
+-PNG_LIBS ?= $(shell pkg-config libpng --libs)
++PNG_CFLAGS ?= $(shell $(PKG_CONFIG) libpng --cflags) -DWITH_PNG
++PNG_LIBS ?= $(shell $(PKG_CONFIG) libpng --libs)
+ CFLAGS_c += $(PNG_CFLAGS)
+ LIBS_c += $(PNG_LIBS)
+
+-JPEG_CFLAGS ?= $(shell pkg-config libjpeg --cflags) -DWITH_JPEG
+-JPEG_LIBS ?= $(shell pkg-config libjpeg --libs)
++JPEG_CFLAGS ?= $(shell $(PKG_CONFIG) libjpeg --cflags) -DWITH_JPEG
++JPEG_LIBS ?= $(shell $(PKG_CONFIG) libjpeg --libs)
+ CFLAGS_c += $(JPEG_CFLAGS)
+ LIBS_c += $(JPEG_LIBS)
+
+-CURL_CFLAGS ?= $(shell pkg-config libcurl --cflags)
+-CURL_LIBS ?= $(shell pkg-config libcurl --libs)
++CURL_CFLAGS ?= $(shell $(PKG_CONFIG) libcurl --cflags)
++CURL_LIBS ?= $(shell $(PKG_CONFIG) libcurl --libs)
+ CFLAGS_c += $(CURL_CFLAGS)
+ LIBS_c += $(CURL_LIBS)
+
+-JANSSON_CFLAGS ?= $(shell pkg-config jansson --cflags)
+-JANSSON_LIBS ?= $(shell pkg-config jansson --libs)
++JANSSON_CFLAGS ?= $(shell $(PKG_CONFIG) jansson --cflags)
++JANSSON_LIBS ?= $(shell $(PKG_CONFIG) jansson --libs)
+ CFLAGS += $(JANSSON_CFLAGS)
+ LIBS_c += $(JANSSON_LIBS)
+
+-MINIZIP_CFLAGS ?= $(shell pkg-config --cflags minizip)
+-MINIZIP_LIBS ?= $(shell pkg-config --libs minizip)
++MINIZIP_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags minizip)
++MINIZIP_LIBS ?= $(shell $(PKG_CONFIG) --libs minizip)
+ CFLAGS_c += $(MINIZIP_CFLAGS)
+ LIBS_c += $(MINIZIP_LIBS)
+
+-SPEEX_LIBS ?= $(shell pkg-config speex --libs) $(shell pkg-config speexdsp
--libs)
++SPEEX_LIBS ?= $(shell $(PKG_CONFIG) speex --libs) $(shell $(PKG_CONFIG)
speexdsp --libs)
+ ifdef SPEEX_LIBS
+- CFLAGS_c += $(shell pkg-config speex --cflags) $(shell pkg-config
speexdsp --cflags) -DWITH_SPEEX
++ CFLAGS_c += $(shell $(PKG_CONFIG) speex --cflags) $(shell $(PKG_CONFIG)
speexdsp --cflags) -DWITH_SPEEX
+ endif
+ LIBS_c += $(SPEEX_LIBS)
+
+ ifndef CONFIG_WINDOWS
+- ifeq ($(shell pkg-config --exists freetype2 && echo 1),1)
+- FREETYPE_CFLAGS ?= $(shell pkg-config freetype2 --cflags)
+- FREETYPE_LIBS ?= $(shell pkg-config freetype2 --libs)
++ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo 1),1)
++ FREETYPE_CFLAGS ?= $(shell $(PKG_CONFIG) freetype2 --cflags)
++ FREETYPE_LIBS ?= $(shell $(PKG_CONFIG) freetype2 --libs)
+ endif
+
+ ifdef FREETYPE_LIBS
+@@ -176,8 +177,8 @@
+ ifdef OLD_WAV_LOADING
+ CFLAGS_c += -DOLD_WAV_LOADING
+ else
+- SNDFILE_CFLAGS ?= $(shell pkg-config sndfile --cflags)
+- SNDFILE_LIBS ?= $(shell pkg-config sndfile --libs)
++ SNDFILE_CFLAGS ?= $(shell $(PKG_CONFIG) sndfile --cflags)
++ SNDFILE_LIBS ?= $(shell $(PKG_CONFIG) sndfile --libs)
+ CFLAGS += $(SNDFILE_CFLAGS)
+ LIBS_c += $(SNDFILE_LIBS)
+ endif
+@@ -560,8 +561,8 @@
+ endif
+
+ #ifdef CONFIG_OGG
+-# OGG_CFLAGS ?= $(shell pkg-config vorbisfile --cflags) -DWITH_OGG_VORBIS
+-# OGG_LIBS ?= $(shell pkg-config vorbisfile --libs)
++# OGG_CFLAGS ?= $(shell $(PKG_CONFIG) vorbisfile --cflags)
-DWITH_OGG_VORBIS
++# OGG_LIBS ?= $(shell $(PKG_CONFIG) vorbisfile --libs)
+ # CFLAGS_c += $(OGG_CFLAGS)
+ # LIBS_c += $(OGG_LIBS)
+ #endif
diff --minimal -Nru ezquake-3.6.4/debian/patches/series
ezquake-3.6.4/debian/patches/series
--- ezquake-3.6.4/debian/patches/series 2024-01-15 05:26:53.000000000 +0100
+++ ezquake-3.6.4/debian/patches/series 2024-08-24 11:53:10.000000000 +0200
@@ -7,3 +7,4 @@
fixes/spelling.patch
fixes/format-string.patch
warnings/incompatible-pointer-types.patch
+cross.patch
diff --minimal -Nru ezquake-3.6.4/debian/rules ezquake-3.6.4/debian/rules
--- ezquake-3.6.4/debian/rules 2024-01-15 05:25:07.000000000 +0100
+++ ezquake-3.6.4/debian/rules 2024-08-24 11:52:49.000000000 +0200
@@ -10,9 +10,22 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+include /usr/share/dpkg/architecture.mk
+
+CPU_MAP_aarch64 = arm
+CPU_MAP_alpha = axp
+CPU_MAP_i686 = i386
+SYS_MAP_linux = Linux
+SYS_MAP_kfreebsd = FreeBSD
+
%:
dh $@
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+override_dh_auto_build:
+ dh_auto_build -- CPU=$(or
$(CPU_MAP_$(DEB_HOST_GNU_CPU)),$(DEB_HOST_GNU_CPU)) SYS=$(or
$(SYS_MAP_$(DEB_HOST_ARCH_OS)),$(DEB_HOST_ARCH_OS))
+endif
+
override_dh_install-arch:
cp ezquake-* ezquake
dh_install
--- End Message ---
--- Begin Message ---
Source: ezquake
Source-Version: 3.6.6-1
Done: Patrice Duroux <[email protected]>
We believe that the bug you reported is fixed in the latest version of
ezquake, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Patrice Duroux <[email protected]> (supplier of updated ezquake package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 05 Apr 2025 12:40:31 +0100
Source: ezquake
Architecture: source
Version: 3.6.6-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <[email protected]>
Changed-By: Patrice Duroux <[email protected]>
Closes: 1079531 1088891 1089179
Changes:
ezquake (3.6.6-1) unstable; urgency=medium
.
* Update d/watch file
* New upstream version 3.6.6 (Closes: #1089179, #1079531)
* Bump SV to 4.7.2
* Update BD
* Improve d/scripts/ezquake
* Remove scripts/convert-keymaps and install
* Refresh d/patches
* Remove for now -Werror in d/rules
* Add d/patches/pcre2.patch (Closes: #1088891)
* d/copyright: remove misc/keymaps/* statement
* Clean up d/rules
* d/rules: binary as moved.
* d/control: remove quake-data dep and reformat (depputy).
* Add a README.Debian.
Checksums-Sha1:
2863d79800b272973c82dd79752876e949bc2bf7 2096 ezquake_3.6.6-1.dsc
93a6202612e3bd69d612a622d73ab6069d478447 1965594 ezquake_3.6.6.orig.tar.gz
2f2bd1106eb4410f47b4cbd11230950f208fd288 6372 ezquake_3.6.6-1.debian.tar.xz
226ca29fbe67ae3b7108b614aae3a2e4e5646279 13559 ezquake_3.6.6-1_source.buildinfo
Checksums-Sha256:
2272e9054c017cc3ccc2fc64efa5d0e759979ba438b3799fd67921375b20f0d0 2096
ezquake_3.6.6-1.dsc
609a6ee4c9a9d3752122013d851ca852fc2ad44ca67fac599e8a78871484ec7f 1965594
ezquake_3.6.6.orig.tar.gz
fa5a12c7891c60f1ddc4eb927bb67f97d788ff13fee85def0fb135b876d71870 6372
ezquake_3.6.6-1.debian.tar.xz
24cd90f0b30a2924d8aed498546342e10de6c33b4c89d95c760de4af3c223d19 13559
ezquake_3.6.6-1_source.buildinfo
Files:
b096f5e9e8913548779ca9caf1b6392c 2096 games optional ezquake_3.6.6-1.dsc
df04fb9ca22fc734cdfb40775a2906be 1965594 games optional
ezquake_3.6.6.orig.tar.gz
8dbf748ab9b432b688fa39ed8fa7b7cb 6372 games optional
ezquake_3.6.6-1.debian.tar.xz
a3d55a373ea99bb0bd1e296cd350788c 13559 games optional
ezquake_3.6.6-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEj23hBDd/OxHnQXSHMfMURUShdBoFAmfxDG8ACgkQMfMURUSh
dBrfow/9E+SvMZ+kV19Z/Z54sGtOhpYVdTxXMNYStQQGSxJGMkPBoL2232yDV7RY
PO7Q9Hwt/4MlRVZk2ziMKNalr31qvx/pEWXq2juhLTQk3lYbZJhoOcqLCl5uaMBJ
zqCTIQWel+3c6n+LQlpNLulazsINVQ4y9qXis5mYYgrDk/aa5YfTYOQJebUOq2xp
Lmkiab+WEDNJm0dkFK3IuE1sXdep+NUeKoayJYuGiUxipIawE+aYH3OHitFk0z6T
wQHml6M3sGb7M9oya62rQT0CRHc2t/E1cT8rI0EMCxmK+QyK8aE+sSMsBNpD/cci
aZ+DMDaTACU24JFM2mi6flYw2cEGiXff/ZJ1y/9gytIyX4R7Zw8G9oY85ok47zjR
6UazH4NbgwDG3Ym8Hz/63QPqFpOuJOCz5Jfapn2lTSbLxa5HBovNxWlFFoj1nG88
TUpeXQC/WpS8OOJVCIoYhJ+C6hpusJcB0fj8JAaRh5d6wFJKD+QIIsgzCjR99R/c
ftUBX2wMWMqVMEKtlviJGVn6k73AOwQaW96Ny0dajFJ0j1bA7XgpkB7z8zhtkFcp
pyTwGVJ9xPPeEFaGgAndVsh9771VP6u+y+qqiRJNMkm6CI8ECaIhTHgmf4hQ3O0n
rY7x7KxAdR68+yR5fOitB96pz49Zo5fdIdCB5mbvlBPFlM2QPbs=
=W+w8
-----END PGP SIGNATURE-----
pgpQisT30L2XT.pgp
Description: PGP signature
--- End Message ---
