Your message dated Mon, 24 Mar 2025 17:48:58 +0000
with message-id <[email protected]>
and subject line Bug#1095770: fixed in gkrelltop 2.2.13-1.3
has caused the Debian Bug report #1095770,
regarding gkrelltop FTCBFS: hard codes build architecture build tools all over
the place
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.)
--
1095770: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1095770
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: gkrelltop
Version: 2.2.13-1.2
Tags: patch
User: [email protected]
Usertags: ftcbfs
gkrelltop fails to cross build from source, because it hard codes build
architecture build tools such as gcc or pkg-config all over the place in
configure and Makefile. I'm attaching a patch that turns them
substitutable and also slightly cleans up debian/rules. After applying
it, gkrelltop cross builds successfully.
Helmut
diff --minimal -Nru gkrelltop-2.2.13/debian/changelog
gkrelltop-2.2.13/debian/changelog
--- gkrelltop-2.2.13/debian/changelog 2024-04-18 08:54:44.000000000 +0200
+++ gkrelltop-2.2.13/debian/changelog 2025-02-11 12:38:43.000000000 +0100
@@ -1,3 +1,10 @@
+gkrelltop (2.2.13-1.3) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Use cross tools. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Tue, 11 Feb 2025 12:38:43 +0100
+
gkrelltop (2.2.13-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru gkrelltop-2.2.13/debian/control
gkrelltop-2.2.13/debian/control
--- gkrelltop-2.2.13/debian/control 2024-04-18 08:54:44.000000000 +0200
+++ gkrelltop-2.2.13/debian/control 2025-02-11 12:31:24.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Adi Zaimi <[email protected]>
Uploaders: Yaroslav Halchenko <[email protected]>
-Build-Depends: debhelper (>= 7), autotools-dev, libgtk2.0-dev, gkrellm,
gkrellmd
+Build-Depends: debhelper (>= 7), autotools-dev, libgtk2.0-dev, gkrellm,
gkrellmd, pkgconf
Standards-Version: 3.8.2
Package: gkrelltop
diff --minimal -Nru gkrelltop-2.2.13/debian/patches/cross.patch
gkrelltop-2.2.13/debian/patches/cross.patch
--- gkrelltop-2.2.13/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ gkrelltop-2.2.13/debian/patches/cross.patch 2025-02-11 12:37:47.000000000
+0100
@@ -0,0 +1,161 @@
+--- gkrelltop-2.2.13.orig/configure
++++ gkrelltop-2.2.13/configure
+@@ -4,8 +4,10 @@
+ # There is no need to run this configure before doing a make.
+ #
+
+-GLIB_INCLUDE=`pkg-config --cflags glib-2.0`
+-GLIB_LIBS=`pkg-config --libs glib-2.0`
++PKG_CONFIG="${PKG_CONFIG-pkg-config}"
++
++GLIB_INCLUDE=`$PKG_CONFIG --cflags glib-2.0`
++GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
+
+ for i
+ do
+@@ -17,8 +19,8 @@
+ done
+
+
+-PKG_INCLUDE=`pkg-config gkrellm --cflags --silence-errors`
+-PKG_LIBS=`pkg-config gkrellm --libs --silence-errors`
++PKG_INCLUDE=`$PKG_CONFIG gkrellm --cflags --silence-errors`
++PKG_LIBS=`$PKG_CONFIG gkrellm --libs --silence-errors`
+
+ if [ "$PKG_INCLUDE" = "" ]
+ then
+@@ -31,7 +33,7 @@
+ fi
+
+
+-rm -f configure.h configure.log test test.o test.c
++rm -f configure.h configure.log test.o test.c
+
+ touch configure.h
+
+@@ -47,23 +49,20 @@
+ cat << EOF > test.c
+ #include <gkrellm2/gkrellmd.h>
+
++#if !defined(GKRELLMD_VERSION_MAJOR)
++#error GKRELLMD_VERSION_MAJOR is not defined
++#endif
++
+ int main()
+ {
+-#if defined(GKRELLMD_VERSION_MAJOR)
+ return 0;
+-#else
+- return 1;
+-#endif
+ }
+
+ EOF
+
+ # echo $CC ${PKG_INCLUDE} -c test.c -o test.o
+
+-$CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
+-$CC test.o -o test ${PKG_LIBS} 2>& 5
+-
+-if [ -e ./test ] && ./test
++if $CC ${PKG_INCLUDE} -c test.c -o test.o 2>& 5
+ then
+ echo "OK, defining HAVE_GKRELLMD" 1>& 5
+ echo "" 1>& 5
+@@ -78,5 +77,5 @@
+
+ #-------------------------------------------------------------------
+
+-rm -f test test.o test.c
++rm -f test.o test.c
+ exit 0
+--- gkrelltop-2.2.13.orig/Makefile
++++ gkrelltop-2.2.13/Makefile
+@@ -28,9 +28,10 @@
+ OSFLAG = $(shell uname | tr '[:lower:]' '[:upper:]')
+ SHELL=/bin/sh
+
++PKG_CONFIG ?= pkg-config
+ GKRELL1FLAG=1
+ #find out if we have gkrellm 2 or 1 (from the gtk+ version)
+-GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo
0')
++GKRELL1FLAG=$(shell bash -c '$(PKG_CONFIG) gtk+-2.0 --cflags &>/dev/null &&
echo 0')
+ GKRELLTOP = gkrelltop.so
+ OBJ = top_three.o gkrelltop.o
+ EXTRA = krell_panel1.xpm
+@@ -43,16 +44,12 @@
+
+ ifeq ($(GKRELL1FLAG),0)
+ # Parameters for gkrellm version 2.*
+-CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
+-LIBS =
+-CC=/usr/bin/gcc $(CFLAGS2)
+-
++CFLAGS += -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `$(PKG_CONFIG) gtk+-2.0
--cflags`
++LIBS = `$(PKG_CONFIG) gtk+-2.0 --libs`
+ else
+ # Parameters for gkrellm version 1.*
+-CC=/usr/bin/cc
+-CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config
--cflags-gdk`
++CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config
--cflags-gdk`
+ LIBS=
+-
+ endif
+
+
+@@ -70,15 +67,14 @@
+ LIBSD =
+ CONFIGURE_ARGS += --with-glib12
+ else
+-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags`
+-LIBSD = `pkg-config glib-2.0 --libs`
++CFLAGSD = -D$(OSFLAG) -fPIC -Wall `$(PKG_CONFIG) glib-2.0 --cflags`
++LIBSD = `$(PKG_CONFIG) glib-2.0 --libs`
+ LIBSD =
+ endif
+ INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR)
+ ifeq ($(INSTALLDIRD),)
+ INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
+ endif
+-CCD=/usr/bin/gcc $(CFLAGSD)
+ OBJD = gkrelltopd.o top_three.o
+
+ DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
+@@ -100,23 +96,23 @@
+ warn: ; $(WARN)
+
+ $(GKRELLTOP): $(OBJ) warn
+- $(CC) -shared $(OBJ) -o $(GKRELLTOP)
++ $(CC) $(CFLAGS) -shared $(OBJ) $(LIBS) -o $(GKRELLTOP)
+
+ # Compile gkrelltopd.so server plugin
+ server: $(GKRELLTOPD) warn
+ @echo ""
+
+ $(GKRELLTOPD): $(OBJD)
+- $(CCD) $(LIBSD) -shared $(OBJD) -o $(GKRELLTOPD)
++ $(CC) $(CFLAGSD) $(LIBSD) -shared $(OBJD) -o $(GKRELLTOPD)
+
+ gkrelltop.o: gkrelltop.c
+- $(CC) -c gkrelltop.c -o gkrelltop.o
++ $(CC) $(CFLAGS) -c gkrelltop.c -o gkrelltop.o
+
+ top_three.o: top_three.c
+- $(CC) -c top_three.c -o top_three.o
++ $(CC) $(CFLAGS) -c top_three.c -o top_three.o
+
+ gkrelltopd.o: gkrelltopd.c
+- $(CCD) -c gkrelltopd.c -o gkrelltopd.o
++ $(CC) $(CFLAGSD) -c gkrelltopd.c -o gkrelltopd.o
+
+ install: $(GKRELLTOP)
+ install -c -m 644 $(GKRELLTOP) $(INSTALLDIR)
+@@ -125,7 +121,7 @@
+ install -c -m 644 $(GKRELLTOPD) $(INSTALLDIRD)
+
+ ttest: top_three.o ttest.o
+- $(CC) top_three.o ttest.o -o ttest
++ $(CC) $(CFLAGS) top_three.o ttest.o -o ttest
+
+ view: $(GKRELLTOP)
+ gkrellm -p $(GKRELLTOP)
diff --minimal -Nru gkrelltop-2.2.13/debian/patches/series
gkrelltop-2.2.13/debian/patches/series
--- gkrelltop-2.2.13/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ gkrelltop-2.2.13/debian/patches/series 2025-02-11 12:28:54.000000000
+0100
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru gkrelltop-2.2.13/debian/rules gkrelltop-2.2.13/debian/rules
--- gkrelltop-2.2.13/debian/rules 2024-04-18 08:54:44.000000000 +0200
+++ gkrelltop-2.2.13/debian/rules 2025-02-11 12:38:39.000000000 +0100
@@ -9,12 +9,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
+DPKG_EXPORT_BUILDTOOLS=1
+include /usr/share/dpkg/buildtools.mk
CFLAGS = -Wall -g
@@ -26,19 +22,14 @@
config.status: configure
dh_testdir
- dh_autoreconf
- # configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ ./configure
build: build-stamp
build-stamp: config.status
dh_testdir
-
- # Compile the package.
- $(MAKE)
-
+ dh_auto_build --buildsystem=makefile
touch $@
clean:
--- End Message ---
--- Begin Message ---
Source: gkrelltop
Source-Version: 2.2.13-1.3
Done: Andreas Tille <[email protected]>
We believe that the bug you reported is fixed in the latest version of
gkrelltop, 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.
Andreas Tille <[email protected]> (supplier of updated gkrelltop 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: Mon, 24 Mar 2025 17:52:00 +0100
Source: gkrelltop
Architecture: source
Version: 2.2.13-1.3
Distribution: unstable
Urgency: medium
Maintainer: Adi Zaimi <[email protected]>
Changed-By: Andreas Tille <[email protected]>
Closes: 879813 1095770 1101018
Changes:
gkrelltop (2.2.13-1.3) unstable; urgency=medium
.
* Non-maintainer upload.
Maintainer confirmed team maintenance in any team is fine.
Closes: #1101018
.
[ Andreas Tille ]
* Move package to Debian team on Salsa
* Add Homepage
* Add watch file
* Standards-Version: 4.7.2 (routine-update)
* debhelper-compat 13 (routine-update)
* d/rules: short dh
* Remove trailing whitespace in debian/changelog (routine-update)
* Remove trailing whitespace in debian/control (routine-update)
* d/control: Add ${misc:Depends}
* Propagate hardening options
.
[ Helmut Grohne ]
* Fix FTCBFS: Use cross tools. (Closes: #1095770)
.
[ Ville Skyttä ]
* Fix stderr on init
Closes: #879813
Checksums-Sha1:
150ee3e71b5b05a524b2ce07eebe9fed3ca626a9 2034 gkrelltop_2.2.13-1.3.dsc
5983316fd7c1346df7569e16d7b6a2600aa0d793 4728
gkrelltop_2.2.13-1.3.debian.tar.xz
59b533c198f997dfbe8a853ad755b14c389cd1e1 12840
gkrelltop_2.2.13-1.3_amd64.buildinfo
Checksums-Sha256:
8ac1059bd94b85c0fc4271c038cb31dc186711f5f775f278bf5371c432ea9195 2034
gkrelltop_2.2.13-1.3.dsc
c50a3c770de968e977deade8e31ce58950ee62130450aa3b24f065974dfea29c 4728
gkrelltop_2.2.13-1.3.debian.tar.xz
22945e7d3f6eee044a82d336408c631253d055b2e7f52321eee89195e500931f 12840
gkrelltop_2.2.13-1.3_amd64.buildinfo
Files:
6aa1fcf9871bce03f52d2c3578744cfd 2034 x11 optional gkrelltop_2.2.13-1.3.dsc
b87589970cb2a266bd3966449c59e447 4728 x11 optional
gkrelltop_2.2.13-1.3.debian.tar.xz
75b4f7a4676872d35091bf70fb0a08e3 12840 x11 optional
gkrelltop_2.2.13-1.3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCgAvFiEE8fAHMgoDVUHwpmPKV4oElNHGRtEFAmfhlvMRHHRpbGxlQGRl
Ymlhbi5vcmcACgkQV4oElNHGRtH/bg/3UOHBbZs+3CNqoK7hVmZzLp2Vcgb8p3Sx
auFFyZ1wOXQsJ8ehRyRYc1V0I5qVpg9ZP2I/sOVaMPYZR3EHVL5ijqXZsaWqfo7F
TqmHwdRXp479xjMnpPKQWj+0T3ya7G7be43N8mBnK/wYylciHK4sgS+uO3+z4n++
CTKYx9FuwfFkrjo7YW2ZLOrmVUS1JfxDRZ/cO0RuPhpBnNUeMn3ApsVtvET4KTd3
aoUJkwkD08NtDTqlqI9IiH2X3j13WfmfrWSu6IltENZHy9ZY3CV1op9MdcwioVbC
kNDSSDS4O5kCe1Lg+ZnlVjz5zz+nS6FZIwvuDLYKcyfWi2yWkhkfYLpQhOlu0XIf
DyBKRk0Nlm74uyCBjzJXy/ZQ9BmQ7oHVHn6L0eixBobynU8QSbSVJuoOQ0dTzsGt
NLC/C08ZuTK80IWTqHJsE4ckNsBbPeh/DAHYfkNXdsX1HUbekKz650qysBsA1Dm0
vftB45ASbsHeVyQBoF9+pCI6/d+jzD8OThKNS3MihJVwS55IWlnbS6JeI0NZonRA
bJafSZmNnlOyRVc3CD5dH4cPpit6FcPBAv1OnhbYvl8xT2Ho1txQD/N8+ZO2D3Dc
CkhqR+jXaWz4X7aVtHSouvNWRc+nnbPp6z47Ny6O5afpL05Im639ccMYLni7IRPb
AFQFhBRhZg==
=kxjK
-----END PGP SIGNATURE-----
pgpVWgIIMnwcZ.pgp
Description: PGP signature
--- End Message ---
