Bug#930926: bbrun FTCBFS: does not pass cross tools to make
Source: bbrun
Version: 1.6-7
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
bbrun 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 - is
insufficient, because the upstream Makefile hard codes the build
architecture pkg-config. The attached patch fixes both. Please consider
applying it.
Helmut
diff --minimal -Nru bbrun-1.6/debian/changelog bbrun-1.6/debian/changelog
--- bbrun-1.6/debian/changelog 2019-06-13 10:30:28.000000000 +0200
+++ bbrun-1.6/debian/changelog 2019-06-22 16:12:54.000000000 +0200
@@ -1,3 +1,11 @@
+bbrun (1.6-8) UNRELEASED; urgency=medium
+
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_build pass cross tools to make.
+ + cross.patch: Make pkg-config substitutable.
+
+ -- Helmut Grohne <helmut@subdivi.de> Sat, 22 Jun 2019 16:12:54 +0200
+
bbrun (1.6-7) unstable; urgency=medium
[ Andreas Beckmann ]
diff --minimal -Nru bbrun-1.6/debian/patches/cross.patch bbrun-1.6/debian/patches/cross.patch
--- bbrun-1.6/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100
+++ bbrun-1.6/debian/patches/cross.patch 2019-06-22 16:12:53.000000000 +0200
@@ -0,0 +1,13 @@
+--- bbrun-1.6.orig/bbrun/Makefile
++++ bbrun-1.6/bbrun/Makefile
+@@ -1,7 +1,8 @@
+ CC = gcc
++PKG_CONFIG ?= pkg-config
+ LIBDIR = -L/usr/lib -L/usr/X11R6/lib
+-LIBS = -lXpm -lX11 -lXext `pkg-config --libs gtk+-2.0`
+-CFLAGS = `pkg-config --cflags gtk+-2.0`
++LIBS = -lXpm -lX11 -lXext `$(PKG_CONFIG) --libs gtk+-2.0`
++CFLAGS = `$(PKG_CONFIG) --cflags gtk+-2.0`
+
+ OBJS = bbrun.o \
+ ../wmgeneral/wmgeneral.o \
diff --minimal -Nru bbrun-1.6/debian/patches/series bbrun-1.6/debian/patches/series
--- bbrun-1.6/debian/patches/series 2019-06-13 10:00:13.000000000 +0200
+++ bbrun-1.6/debian/patches/series 2019-06-22 16:12:32.000000000 +0200
@@ -5,3 +5,4 @@
05_gcc5-gnu89.patch
06_Use-pointer-type-instead-of-32bit-integer-to-store-h.patch
clang-ftbfs.diff
+cross.patch
diff --minimal -Nru bbrun-1.6/debian/rules bbrun-1.6/debian/rules
--- bbrun-1.6/debian/rules 2019-06-13 09:27:23.000000000 +0200
+++ bbrun-1.6/debian/rules 2019-06-22 16:12:19.000000000 +0200
@@ -19,7 +19,7 @@
build-stamp:
dh_testdir
- $(MAKE) -C bbrun
+ dh_auto_build --sourcedirectory=bbrun
touch build-stamp
clean:
Reply to: