Source: gkrellm-xkb Version: 1.05-5 Tags: patch User: debian-cr...@lists.debian.org Usertags: ftcbfs
gkrellm-xkb fails to cross build from source, because it builds for the build architecture. debian/rules does not pass cross tools to make. The easiest way to fix that is using dh_auto_build. Beyond that, the upstream Makefile hard codes the build architecture pkg-config. Making pkg-config substitutable is necessary here. It finally strips using the build architecture strip via install -s during make install. Beyond breaking cross compilation, this also breaks generation of -dbgsym packages as well as DEB_BUILD_OPTIONS=nostrip. The attached patch fixes all of that. Please consider applying it. Helmut
diff -u gkrellm-xkb-1.05/Makefile gkrellm-xkb-1.05/Makefile --- gkrellm-xkb-1.05/Makefile +++ gkrellm-xkb-1.05/Makefile @@ -1,6 +1,7 @@ PREFIX ?= $(DESTDIR)/usr -GTK_CONFIG = pkg-config gtk+-2.0 +PKG_CONFIG ?= pkg-config +GTK_CONFIG = $(PKG_CONFIG) gtk+-2.0 PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins GKRELLM_INCLUDE = -I$(PREFIX)/include GTK_CFLAGS = `$(GTK_CONFIG) --cflags` diff -u gkrellm-xkb-1.05/debian/control gkrellm-xkb-1.05/debian/control --- gkrellm-xkb-1.05/debian/control +++ gkrellm-xkb-1.05/debian/control @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Adam Sloboda <j...@disorder.sk> -Build-Depends: debhelper (>= 5), gkrellm (>= 2.0.0), libgtk2.0-dev, pkg-config +Build-Depends: debhelper (>= 7), gkrellm (>= 2.0.0), libgtk2.0-dev, pkg-config Standards-Version: 3.7.3 Homepage: http://www.sweb.cz/tripie/gkrellm/xkb/ diff -u gkrellm-xkb-1.05/debian/rules gkrellm-xkb-1.05/debian/rules --- gkrellm-xkb-1.05/debian/rules +++ gkrellm-xkb-1.05/debian/rules @@ -22,7 +22,7 @@ build-stamp: configure-stamp dh_testdir - $(MAKE) + dh_auto_build touch $@ clean: @@ -37,7 +37,7 @@ dh_testroot dh_clean -k dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/gkrellm-xkb install + $(MAKE) DESTDIR=$(CURDIR)/debian/gkrellm-xkb install 'INSTALL=install --strip-program=true' # Build architecture-independent files here. diff -u gkrellm-xkb-1.05/debian/changelog gkrellm-xkb-1.05/debian/changelog --- gkrellm-xkb-1.05/debian/changelog +++ gkrellm-xkb-1.05/debian/changelog @@ -1,3 +1,13 @@ +gkrellm-xkb (1.05-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #-1) + + Let dh_auto_build pass cross tools to make. + + Make pkg-config substitutable. + + Defer stripping to dh_strip. + + -- Helmut Grohne <hel...@subdivi.de> Mon, 20 Apr 2020 07:05:11 +0200 + gkrellm-xkb (1.05-5) unstable; urgency=low * Fixed lintian warnings about upstream changelog
