Source: gkrellm-reminder
Version: 2.0.0-3
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
gkrellm-reminder fails to cross build from source, because it does not
pass cross tools to make. The easiest way of fixing that - using
dh_auto_build - does not suffice here, because the upstream Makefile
hard codes the build architecture pkg-config. It needs to be made
substitutable. Beyond that debian/rules uses install with the -s flag,
which uses the build architecture strip. Beyond breaking cross
compilation, doing so also breaks DEB_BUILD_OPTIONS=nostrip (#437032)
and generation of -dbgsym packages. The attached patch fixes all of that
including #437032. Please consider applying it.
Helmut
diff -u gkrellm-reminder-2.0.0/debian/control
gkrellm-reminder-2.0.0/debian/control
--- gkrellm-reminder-2.0.0/debian/control
+++ gkrellm-reminder-2.0.0/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Joerg Jaspert <jo...@debian.org>
Uploaders: Ricardo Mones <mo...@debian.org>
-Build-Depends: debhelper (>> 5), libgtk2.0-dev, gkrellm
+Build-Depends: debhelper (>= 7), libgtk2.0-dev, gkrellm
Standards-Version: 3.8.2
Package: gkrellm-reminder
diff -u gkrellm-reminder-2.0.0/debian/changelog
gkrellm-reminder-2.0.0/debian/changelog
--- gkrellm-reminder-2.0.0/debian/changelog
+++ gkrellm-reminder-2.0.0/debian/changelog
@@ -1,3 +1,13 @@
+gkrellm-reminder (2.0.0-3.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 21:11:28 +0200
+
gkrellm-reminder (2.0.0-3) unstable; urgency=low
[ Luk Claes ]
diff -u gkrellm-reminder-2.0.0/debian/rules gkrellm-reminder-2.0.0/debian/rules
--- gkrellm-reminder-2.0.0/debian/rules
+++ gkrellm-reminder-2.0.0/debian/rules
@@ -2,7 +2,7 @@
build:
dh_testdir
- $(MAKE)
+ dh_auto_build
clean:
dh_testdir
@@ -16,7 +16,7 @@
dh_clean -k
dh_installdirs
install -d debian/gkrellm-reminder/usr/lib/gkrellm2/plugins
- install -c -s -m 755 reminder.so \
+ install -c -m 755 reminder.so \
debian/gkrellm-reminder/usr/lib/gkrellm2/plugins
only in patch2:
unchanged:
--- gkrellm-reminder-2.0.0.orig/Makefile
+++ gkrellm-reminder-2.0.0/Makefile
@@ -1,5 +1,6 @@
-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
-GTK_LIB = `pkg-config gtk+-2.0 --libs`
+PKG_CONFIG ?= pkg-config
+GTK_INCLUDE = `$(PKG_CONFIG) gtk+-2.0 --cflags`
+GTK_LIB = `$(PKG_CONFIG) gtk+-2.0 --libs`
CFLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) -I/usr/pkg/include
