Source: gerstensaft
Version: 0.3-4.2
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
gerstensaft fails to cross build from source, because it does not pass
cross tools to make. Pretty please, can you use debhelper? That would be
a lot less annoying to fix. Anyway, I've attached a patch that manually
passes the relevant cross tools. Beyond this, it also strips at make
install time with the build architecture strip, which happens to break
DEB_BUILD_OPTIONS=nostrip (#436972) as well as generation of -dbgsym
packages. The attached patch fixes all mentioned issues. Please consider
applying it.
Helmut
diff -u gerstensaft-0.3/debian/changelog gerstensaft-0.3/debian/changelog
--- gerstensaft-0.3/debian/changelog
+++ gerstensaft-0.3/debian/changelog
@@ -1,3 +1,12 @@
+gerstensaft (0.3-4.3) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Pass cross tools CC and PKG_CONFIG.
+ + Pass a non-stripping install. (Closes: #436972)
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 24 Jun 2021 12:31:48 +0200
+
gerstensaft (0.3-4.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u gerstensaft-0.3/debian/rules gerstensaft-0.3/debian/rules
--- gerstensaft-0.3/debian/rules
+++ gerstensaft-0.3/debian/rules
@@ -27,19 +27,22 @@
installbin = install -g root -o root -m 755
installdoc = install -g root -o root -m 644
+-include /usr/share/dpkg/buildtools.mk
+PKG_CONFIG ?= pkg-config
+
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS = -g -O2 -Wall
else
CFLAGS = -O2 -Wall
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-STRIP = strip
+STRIP ?= strip
else
STRIP = echo
endif
build:
- $(MAKE) PIXMAP_WM_DIR=/usr/share/pixmaps prefix=/usr
+ $(MAKE) PIXMAP_WM_DIR=/usr/share/pixmaps prefix=/usr CC='$(CC)'
PKG_CONFIG="$(PKG_CONFIG)"
touch stamp-build
clean: debclean
@@ -69,7 +72,7 @@
$(installdoc) readme debian/tmp/usr/share/doc/$(package)/
gzip -9nf debian/tmp/usr/share/doc/$(package)/changelog.Debian
#
- $(MAKE) PIXMAP_WM_DIR=`pwd`/debian/tmp/usr/share/pixmaps
prefix=`pwd`/debian/tmp/usr install
+ $(MAKE) PIXMAP_WM_DIR=`pwd`/debian/tmp/usr/share/pixmaps
prefix=`pwd`/debian/tmp/usr install='install --strip-program=true' install
gzip -9n debian/tmp/usr/share/man/man?/*
$(STRIP) debian/tmp/usr/bin/beer
#
diff -u gerstensaft-0.3/src/Makefile gerstensaft-0.3/src/Makefile
--- gerstensaft-0.3/src/Makefile
+++ gerstensaft-0.3/src/Makefile
@@ -25,8 +25,9 @@
-DG_DISABLE_DEPRECATED \
-GTK_CFLAGS=$(shell pkg-config gtk+-2.0 --cflags)
-GTK_LIBS=$(shell pkg-config gtk+-2.0 --libs)
+PKG_CONFIG ?= pkg-config
+GTK_CFLAGS=$(shell $(PKG_CONFIG) gtk+-2.0 --cflags)
+GTK_LIBS=$(shell $(PKG_CONFIG) gtk+-2.0 --libs)
CFLAGS+=$(GTK_CFLAGS)
LIBS+=$(GTK_LIBS)
