retitle 870669 move gcj-jdk from Build-Depends to Build-Depends-Indep tags 870669 + patch severity 870669 normal user helm...@debian.org usertags 870669 + rebootstrap thanks
On Thu, Aug 03, 2017 at 03:14:48PM -0700, Daniel Schepler wrote: > It would be nice if the Build-Depends on gcj-jdk could be moved to > Build-Depends-Indep. (I did recently see notifications that gcj will > be going away in Debian soon. But even if you switch over to using > default-jdk, that would still create a build dependency cycle since > openjdk-8 Build-Depends on libcups2-dev also.) I second that. The gcj-jdk dependency also breaks cross compilation and moving it to Build-Depends-Indep significantly simplifies debian/rules as the attached patch demonstrates. In particular, it removes all those different(!) architecture lists. Though I'd much rather see libidn go. Most rdeps but hesiod have moved on to libidn2-0. Helmut
diff --minimal -Nru libidn-1.33/debian/changelog libidn-1.33/debian/changelog --- libidn-1.33/debian/changelog 2017-09-12 11:18:33.000000000 +0200 +++ libidn-1.33/debian/changelog 2017-09-13 14:00:38.000000000 +0200 @@ -1,3 +1,10 @@ +libidn (1.33-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move java dependencies to Build-Depends-Indep (Closes: #870669) + + -- Helmut Grohne <hel...@subdivi.de> Wed, 13 Sep 2017 14:00:38 +0200 + libidn (1.33-2) unstable; urgency=high * CVE-2017-14062: Fix integer overflow in decode_digit (Closes: #873903) diff --minimal -Nru libidn-1.33/debian/control libidn-1.33/debian/control --- libidn-1.33/debian/control 2017-09-12 11:18:33.000000000 +0200 +++ libidn-1.33/debian/control 2017-09-13 14:00:35.000000000 +0200 @@ -4,7 +4,8 @@ Maintainer: Debian Libidn Team <help-lib...@gnu.org> Uploaders: Anibal Monsalve Salazar <ani...@debian.org>, Simon Josefsson <si...@josefsson.org>, OndÅej Surý <ond...@debian.org> Standards-Version: 3.9.8 -Build-Depends: debhelper (>= 9), gcj-jdk [!arm !hppa !hurd-i386 !mips64el], fastjar [!arm !hppa !hurd-i386 !mips64el], dh-autoreconf, autopoint (>= 0.19.3), help2man, texinfo +Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint (>= 0.19.3), help2man, texinfo +Build-Depends-Indep: gcj-jdk, fastjar Homepage: https://www.gnu.org/software/libidn/ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libidn.git Vcs-Git: https://anonscm.debian.org/git/collab-maint/libidn.git diff --minimal -Nru libidn-1.33/debian/rules libidn-1.33/debian/rules --- libidn-1.33/debian/rules 2017-09-12 11:18:33.000000000 +0200 +++ libidn-1.33/debian/rules 2017-09-13 14:00:38.000000000 +0200 @@ -4,16 +4,12 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all -# Don't build libidn11-java on platforms that doesn't have gcj. -NO_JAVA_ARCHES := arm hppa hurd-i386 mips64el or1k -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES))) - # Or when bootstrapping, because libidn is needed before gcj, see #738147. - export DH_OPTIONS=-Nlibidn11-java -else ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_JAVA_ARCHES))) - ENABLE_JAVA := --enable-java +DOPACKAGES = $(shell dh_listpackages) +CONFIGURE_FLAGS := +ifneq ($(filter libidn11-java,$(DOPACKAGES)),) +CONFIGURE_FLAGS += --enable-java else - export DH_OPTIONS=-Nlibidn11-java +CONFIGURE_FLAGS += --disable-java endif %: @@ -26,7 +22,7 @@ --with-packager-version=$(CFG_VERS) \ --with-packager-bug-reports=https://bugs.debian.org/ \ --disable-silent-rules \ - $(ENABLE_JAVA) + $(CONFIGURE_FLAGS) override_dh_auto_install: dh_auto_install
