Source: jigdo
Version: 0.7.3-4
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
jigdo fails to cross build from source. For one thing, it doesn't pass
--host to ./configure, which is required for cross building. Luckily,
dh_auto_configure does that automatically. Then, it uses plain
pkg-config and thus fails finding libraries. A triplet-prefixed
pkg-config finds host architecture libraries. And then it
unconditionally executes the test suite even though
DEB_BUILD_OPTIONS=nocheck should skip it. The attached patch fixes all
of these problems. Please consider applying it after stretch is
released.
Helmut
diff -u jigdo-0.7.3/debian/changelog jigdo-0.7.3/debian/changelog
--- jigdo-0.7.3/debian/changelog
+++ jigdo-0.7.3/debian/changelog
@@ -1,3 +1,13 @@
+jigdo (0.7.3-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Closes: #-1)
+ + Let dh_auto_configure pass cross compilers
+ + Use triplet-prefixed pkg-config
+ + Honour DEB_BUILD_OPTIONS=nocheck
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 09 Jun 2017 21:16:35 +0200
+
jigdo (0.7.3-4) unstable; urgency=low
* New maintainer (Closes: #833158). Thanks to Richard for all his hard
diff -u jigdo-0.7.3/debian/rules jigdo-0.7.3/debian/rules
--- jigdo-0.7.3/debian/rules
+++ jigdo-0.7.3/debian/rules
@@ -3,16 +3,18 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpkg/architecture.mk
+
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+PKG_CONFIG ?= $(DEB_HOST_GNU_TYPE)-pkg-config
configure: configure-stamp
configure-stamp:
dh_testdir
- ./configure --prefix=/usr --without-gui --enable-nls \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ dh_auto_configure -- --without-gui --enable-nls
touch configure-stamp
build: build-arch build-indep
@@ -26,11 +28,13 @@
EXTRA_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" \
EXTRA_LDFLAGS="${LDFLAGS}"
- $(MAKE) X="`pkg-config glib-2.0 --cflags`" \
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+ $(MAKE) X="`$(PKG_CONFIG) glib-2.0 --cflags`" \
EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
EXTRA_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" \
EXTRA_LDFLAGS="${LDFLAGS}" \
- GLIBLIBS="`pkg-config glib-2.0 --libs`" -C src test || true
+ GLIBLIBS="`$(PKG_CONFIG) glib-2.0 --libs`" -C src test || true
+endif
touch build-stamp
clean:
