Control: tags -1 + patch
Hi Paul,
First of all, I'm sorry. I made mistakes on this bug and I was slow to
respond. Please accept apologies.
On Tue, Jan 17, 2023 at 12:58:26AM +0800, Ying-Chun Liu (PaulLiu) wrote:
> After debclean, I cannot find AM_PATH_GLIB_2_0 anymore.
This is correct. I was wrong.
> Can you confirm that it is still being used? Any build logs?
I saw cross builds failing in the same way and concluded too quickly
that the macro was at fault. The issue is deeper than that.
You can find cross build logs at
https://crossqa.debian.net/src/xsystem35.
The immediate failure arises from bin/esd-config hard coding the build
architecture pkg-config. I suggest using $PKG_CONFIG there and exporting
it from debian/rules. The same applies to debian/bin/freetype-config.
Unfortunately, we also deal with AM_PATH_GTK_2_0, which spoils
pkg-config in the same way as AM_PATH_GLIB_2_0 did. Thanks for
demonstrating how simple it is to get rid of it and once deleting it as
well, xsystem35 actually cross builds.
I'm attaching a complete patch and hope that this settles it. Thanks for
bearing with me.
Helmut
diff --minimal -Nru xsystem35-1.7.3-pre5/debian/bin/freetype-config
xsystem35-1.7.3-pre5/debian/bin/freetype-config
--- xsystem35-1.7.3-pre5/debian/bin/freetype-config 2018-11-05
22:19:30.000000000 +0100
+++ xsystem35-1.7.3-pre5/debian/bin/freetype-config 2023-01-27
17:12:08.000000000 +0100
@@ -14,7 +14,7 @@
# if `pkg-config' is available, use values from `freetype2.pc'
-/usr/bin/pkg-config --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
+$PKG_CONFIG --atleast-pkgconfig-version 0.24 >/dev/null 2>&1
if test $? -eq 0 ; then
# note that option `--variable' is not affected by the
# PKG_CONFIG_SYSROOT_DIR environment variable
@@ -23,17 +23,17 @@
export PKG_CONFIG_SYSROOT_DIR
fi
- prefix=`/usr/bin/pkg-config --variable prefix freetype2`
- exec_prefix=`/usr/bin/pkg-config --variable exec_prefix freetype2`
+ prefix=`$PKG_CONFIG --variable prefix freetype2`
+ exec_prefix=`$PKG_CONFIG --variable exec_prefix freetype2`
- includedir=`/usr/bin/pkg-config --variable includedir freetype2`
- libdir=`/usr/bin/pkg-config --variable libdir freetype2`
+ includedir=`$PKG_CONFIG --variable includedir freetype2`
+ libdir=`$PKG_CONFIG --variable libdir freetype2`
- version=`/usr/bin/pkg-config --modversion freetype2`
+ version=`$PKG_CONFIG --modversion freetype2`
- cflags=`/usr/bin/pkg-config --cflags freetype2`
- dynamic_libs=`/usr/bin/pkg-config --libs freetype2`
- static_libs=`/usr/bin/pkg-config --static --libs freetype2`
+ cflags=`$PKG_CONFIG --cflags freetype2`
+ dynamic_libs=`$PKG_CONFIG --libs freetype2`
+ static_libs=`$PKG_CONFIG --static --libs freetype2`
else
prefix="/usr"
exec_prefix="/usr"
diff --minimal -Nru xsystem35-1.7.3-pre5/debian/changelog
xsystem35-1.7.3-pre5/debian/changelog
--- xsystem35-1.7.3-pre5/debian/changelog 2022-12-26 13:38:29.000000000
+0100
+++ xsystem35-1.7.3-pre5/debian/changelog 2023-01-27 17:12:14.000000000
+0100
@@ -1,3 +1,14 @@
+xsystem35 (1.7.3-pre5-9.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #958676)
+ + Use the host's pkg-config in debian/esd-config and
+ debian/bin/freetype-config.
+ + Export PKG_CONFIG for the earlier scripts.
+ + Also kill broken copy macros/gtk-2.0.m4.
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 27 Jan 2023 17:12:14 +0100
+
xsystem35 (1.7.3-pre5-9) unstable; urgency=low
* Remove broken embedded copy of AM_PATH_GLIB_2_0 (Closes: #958676)
diff --minimal -Nru xsystem35-1.7.3-pre5/debian/clean
xsystem35-1.7.3-pre5/debian/clean
--- xsystem35-1.7.3-pre5/debian/clean 2022-12-26 13:33:49.000000000 +0100
+++ xsystem35-1.7.3-pre5/debian/clean 2023-01-27 17:12:14.000000000 +0100
@@ -26,6 +26,7 @@
macros/lib-ld.m4
macros/isc-posix.m4
macros/glib-2.0.m4
+macros/gtk-2.0.m4
libltdl/config.h
libltdl/config.status
libltdl/libtool
diff --minimal -Nru xsystem35-1.7.3-pre5/debian/esd-config
xsystem35-1.7.3-pre5/debian/esd-config
--- xsystem35-1.7.3-pre5/debian/esd-config 2019-11-27 10:29:30.000000000
+0100
+++ xsystem35-1.7.3-pre5/debian/esd-config 2023-01-27 17:11:24.000000000
+0100
@@ -1,3 +1,3 @@
#!/bin/sh
-pkg-config libpulse-simple "$@"
+$PKG_CONFIG libpulse-simple "$@"
diff --minimal -Nru xsystem35-1.7.3-pre5/debian/rules
xsystem35-1.7.3-pre5/debian/rules
--- xsystem35-1.7.3-pre5/debian/rules 2019-11-27 15:54:59.000000000 +0100
+++ xsystem35-1.7.3-pre5/debian/rules 2023-01-27 17:12:14.000000000 +0100
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
# -*- makefile -*-
+include /usr/share/dpkg/buildtools.mk
+export PKG_CONFIG
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
