Source: libidn2
Version: 2.0.4-1.1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Hi libidn2 maintainers,
I'd like to ask you for another favour. Can we remove the whole gtkdoc
stack from Build-Depends? e.g. dblatex is presently unsatisfiable for
cross and it won't be any easier for native bootstraps.
The good thing is that we can do entirely without build profiles. Just
move the whole caboodle to Build-Depends-Indep! Of course we must be
careful then. We must configure without --enable-gtk-doc and notably, we
must not run gtkdocize. The attached patch does all of that and thus
speeds up arch-only builds. Please consider applying it.
Helmut
diff --minimal -Nru libidn2-2.0.4/debian/changelog
libidn2-2.0.4/debian/changelog
--- libidn2-2.0.4/debian/changelog 2017-11-23 12:11:41.000000000 +0100
+++ libidn2-2.0.4/debian/changelog 2018-03-01 22:12:01.000000000 +0100
@@ -1,3 +1,10 @@
+libidn2 (2.0.4-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move some Build-Depends to Build-Depends-Indep. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 01 Mar 2018 22:12:01 +0100
+
libidn2 (2.0.4-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru libidn2-2.0.4/debian/control libidn2-2.0.4/debian/control
--- libidn2-2.0.4/debian/control 2017-11-23 12:11:41.000000000 +0100
+++ libidn2-2.0.4/debian/control 2018-03-01 22:08:40.000000000 +0100
@@ -10,6 +10,7 @@
libunistring-dev,
pkg-config,
ruby-ronn,
+Build-Depends-Indep:
texinfo,
texlive,
gtk-doc-tools,
diff --minimal -Nru libidn2-2.0.4/debian/rules libidn2-2.0.4/debian/rules
--- libidn2-2.0.4/debian/rules 2017-11-23 12:11:41.000000000 +0100
+++ libidn2-2.0.4/debian/rules 2018-03-01 22:11:58.000000000 +0100
@@ -1,21 +1,31 @@
#! /usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DOPACKAGES = $(shell dh_listpackages)
%:
dh $@ --parallel --with autoreconf --fail-missing
-O--dbgsym-migration="libidn2-0-dbg (<< 2.0.2-1~)" -X.la
+ifneq ($(filter libidn2-doc,$(DOPACKAGES)),)
+# run gtkdocize in addition to autoreconf
override_dh_autoreconf:
dh_autoreconf debian/autogen.sh
+endif
+
+CONFIGURE_FLAGS = \
+ --enable-ld-version-script \
+ --disable-rpath \
+ --with-packager=Debian \
+ --with-packager-bug-reports=https://bugs.debian.org/ \
+ --with-packager-version="$(DEB_VERSION)"
+ifneq ($(filter libidn2-doc,$(DOPACKAGES)),)
+CONFIGURE_FLAGS += --enable-gtk-doc --enable-gtk-doc-pdf
+else
+CONFIGURE_FLAGS += --disable-gtk-doc --disable-gtk-doc-pdf
+endif
override_dh_auto_configure:
- dh_auto_configure -- \
- --enable-ld-version-script \
- --disable-rpath \
- --enable-gtk-doc --enable-gtk-doc-pdf \
- --with-packager=Debian \
- --with-packager-bug-reports=https://bugs.debian.org/ \
- --with-packager-version="$(DEB_VERSION)"
+ dh_auto_configure -- $(CONFIGURE_FLAGS)
# Texinfo PDF manual is not built by 'make' but removed by 'make clean'.
override_dh_auto_build:
