Source: choosewm Version: 0.1.6-3 Tags: patch User: [email protected] Usertags: rebootstrap
choosewm fails to cross build from source, because debian/rules hard codes the build architecture pkg-config. The attached patch uses dpkg's buildtools.mk to supply the right pkg-config and makes choosewm cross buildable. Please consider applying it. Helmut
diff --minimal -Nru choosewm-0.1.6/debian/changelog choosewm-0.1.6/debian/changelog --- choosewm-0.1.6/debian/changelog 2011-08-24 10:52:20.000000000 +0200 +++ choosewm-0.1.6/debian/changelog 2019-05-22 06:15:48.000000000 +0200 @@ -1,3 +1,10 @@ +choosewm (0.1.6-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Let dpkg's buildtools.mk supply pkg-config. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Wed, 22 May 2019 06:15:48 +0200 + choosewm (0.1.6-3) unstable; urgency=low * quick fix to make it build again until I have time for diff --minimal -Nru choosewm-0.1.6/debian/rules choosewm-0.1.6/debian/rules --- choosewm-0.1.6/debian/rules 2011-08-24 10:47:57.000000000 +0200 +++ choosewm-0.1.6/debian/rules 2019-05-22 06:15:44.000000000 +0200 @@ -3,8 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +include /usr/share/dpkg/architecture.mk +-include /usr/share/dpkg/buildtools.mk +PKG_CONFIG ?= pkg-config CFLAGS := $(shell dpkg-buildflags --get CFLAGS) CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) @@ -12,7 +13,7 @@ CFLAGS += -Wall -g -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith LDFLAGS := -Wl,-z,defs $(LDFLAGS) -CPPFLAGS := $(CPPFLAGS) $(shell pkg-config --cflags gtk+-x11-2.0) +CPPFLAGS := $(CPPFLAGS) $(shell $(PKG_CONFIG) --cflags gtk+-x11-2.0) ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
