Source: zutils
Version: 1.8-5
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
zutils fails to cross build from source, because it uses help2man. In
this case, we can perform an additional build pass for help2man. Please
consider applying the attached patch. It also simplifies the
construction of CXX.
Helmut
diff --minimal -Nru zutils-1.8/debian/changelog zutils-1.8/debian/changelog
--- zutils-1.8/debian/changelog 2019-11-18 14:49:20.000000000 +0100
+++ zutils-1.8/debian/changelog 2019-11-26 16:39:34.000000000 +0100
@@ -1,3 +1,11 @@
+zutils (1.8-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Perform a native build pass for help2man. (Closes: #-1)
+ * Let dpkg's buildtools.mk initialize CXX.
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 26 Nov 2019 16:39:34 +0100
+
zutils (1.8-5) sid; urgency=medium
* Uploading to sid.
diff --minimal -Nru zutils-1.8/debian/rules zutils-1.8/debian/rules
--- zutils-1.8/debian/rules 2019-07-06 21:20:13.000000000 +0200
+++ zutils-1.8/debian/rules 2019-11-26 16:39:34.000000000 +0100
@@ -1,14 +1,15 @@
#!/usr/bin/make -f
include /usr/share/dpkg/architecture.mk
-
-ifeq ($(origin CXX),default)
-CXX := $(DEB_HOST_GNU_TYPE)-g++
-endif
+include /usr/share/dpkg/buildtools.mk
%:
dh ${@}
+dh_auto_clean:
+ dh_auto_clean
+ dh_auto_clean --builddirectory=native-build
+
override_dh_auto_configure:
LDFLAGS="${LDFLAGS} -static" dh_auto_configure -- --exec-prefix=/
CXX=$(CXX)
@@ -17,8 +18,15 @@
# manpage
mkdir -p debian/zutils/usr/share/man/man1
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure
--builddirectory=native-build
+ dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_build
--builddirectory=native-build
+ help2man --name 'search compressed and uncompressed files'
native-build/zegrep > debian/zutils/usr/share/man/man1/zegrep.1
+ help2man --name 'search compressed and uncompressed files'
native-build/zfgrep > debian/zutils/usr/share/man/man1/zfgrep.1
+else
help2man --name 'search compressed and uncompressed files'
debian/zutils/bin/zegrep > debian/zutils/usr/share/man/man1/zegrep.1
help2man --name 'search compressed and uncompressed files'
debian/zutils/bin/zfgrep > debian/zutils/usr/share/man/man1/zfgrep.1
+endif
# removing unused files
rm -f debian/zutils/usr/share/info/dir*
