Source: libidn Version: 1.33-2 Tags: patch Control: block -1 by 870669 User: [email protected] Usertags: rebootstrap
The 1.33-2 upload added help2man to the mix and that makes libidn fail to cross build from source of course. The attached patch adds a second, native build pass for generating doc/idn.1 and fixes the build. Given that the gcj-jdk dependency also breaks cross builds, the attached patch builds on the patch for #870669. Please consider applying both. Helmut
diff --minimal -Nru libidn-1.33/debian/changelog libidn-1.33/debian/changelog --- libidn-1.33/debian/changelog 2017-09-13 14:00:38.000000000 +0200 +++ libidn-1.33/debian/changelog 2017-09-13 16:49:23.000000000 +0200 @@ -1,3 +1,10 @@ +libidn (1.33-2.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Add a native build pass for help2man. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Wed, 13 Sep 2017 16:49:23 +0200 + libidn (1.33-2.1) UNRELEASED; urgency=medium * Non-maintainer upload. diff --minimal -Nru libidn-1.33/debian/rules libidn-1.33/debian/rules --- libidn-1.33/debian/rules 2017-09-13 14:00:38.000000000 +0200 +++ libidn-1.33/debian/rules 2017-09-13 16:49:23.000000000 +0200 @@ -1,28 +1,39 @@ #!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk + export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all +CFG_VERS = `dpkg-parsechangelog | grep ^Version: | cut -d\ -f2` + DOPACKAGES = $(shell dh_listpackages) -CONFIGURE_FLAGS := +CONFIGURE_FLAGS := \ + --with-packager=Debian \ + --with-packager-version=$(CFG_VERS) \ + --with-packager-bug-reports=https://bugs.debian.org/ \ + --disable-silent-rules ifneq ($(filter libidn11-java,$(DOPACKAGES)),) CONFIGURE_FLAGS += --enable-java else CONFIGURE_FLAGS += --disable-java endif +NATIVE = eval $$(dpkg-architecture -f -a$(DEB_BUILD_ARCH) -s); %: dh $@ --parallel --builddirectory=build --with autoreconf -CFG_VERS = `dpkg-parsechangelog | grep ^Version: | cut -d\ -f2` - override_dh_auto_configure: - dh_auto_configure -- --with-packager=Debian \ - --with-packager-version=$(CFG_VERS) \ - --with-packager-bug-reports=https://bugs.debian.org/ \ - --disable-silent-rules \ - $(CONFIGURE_FLAGS) +ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) + $(NATIVE) dh_auto_configure -- $(CONFIGURE_FLAGS) + $(NATIVE) dh_auto_build + $(NATIVE) dh_auto_clean + test -f doc/idn.1 + dh_auto_configure -- $(CONFIGURE_FLAGS) HELP2MAN=true +else + dh_auto_configure -- $(CONFIGURE_FLAGS) +endif override_dh_auto_install: dh_auto_install
_______________________________________________ Help-libidn mailing list [email protected] https://lists.gnu.org/mailman/listinfo/help-libidn
