Source: libproxy
Version: 0.4.15-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
libproxy fails to cross build from source, because installing its
Build-Depends fails. Python is requested for the host architecture and
that fails to install. Looking further, python is only actually needed
for building Architecture: all packages. So it should be possible to get
rid of the problem by moving those dependencies to Build-Depends-Indep.
The attached patch implements that and I verified that the resulting
binary packages are bit-identical up to build-ids with reproducible
builds and diffoscope for full builds vs. arch-only vs. indep-only.
Please consider applying the attached patch to move libproxy a little
closer to being cross buildable.
Helmut
diff --minimal -Nru libproxy-0.4.15/debian/changelog
libproxy-0.4.15/debian/changelog
--- libproxy-0.4.15/debian/changelog 2018-03-28 19:06:45.000000000 +0200
+++ libproxy-0.4.15/debian/changelog 2018-09-19 20:17:58.000000000 +0200
@@ -1,3 +1,10 @@
+libproxy (0.4.15-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Demote python Build-Depends to Build-Depends-Indep. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 19 Sep 2018 20:17:58 +0200
+
libproxy (0.4.15-1) unstable; urgency=medium
* New upstream release
diff --minimal -Nru libproxy-0.4.15/debian/control
libproxy-0.4.15/debian/control
--- libproxy-0.4.15/debian/control 2018-03-28 19:06:45.000000000 +0200
+++ libproxy-0.4.15/debian/control 2018-09-19 20:17:58.000000000 +0200
@@ -7,15 +7,12 @@
Priority: optional
Maintainer: Debian GNOME Maintainers
<pkg-gnome-maintain...@lists.alioth.debian.org>
Uploaders: Iain Lane <la...@debian.org>, Jeremy Bicha <jbi...@debian.org>,
Laurent Bigonville <bi...@debian.org>, Michael Biebl <bi...@debian.org>
-Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!stage1>, mono-devel (>=
2.4.3) <!stage1>
+Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!stage1>, mono-devel (>=
2.4.3) <!stage1>, dh-python, python-all-dev (>= 2.6.6-3~), python3-all
Build-Depends: debhelper (>= 11),
- dh-python,
gnome-pkg-tools,
netbase,
cmake,
zlib1g-dev,
- python-all-dev (>= 2.6.6-3~),
- python3-all,
libnm-dev [linux-any],
libdbus-1-dev,
libkf5config-bin <!stage1>,
diff --minimal -Nru libproxy-0.4.15/debian/rules libproxy-0.4.15/debian/rules
--- libproxy-0.4.15/debian/rules 2018-03-28 19:06:45.000000000 +0200
+++ libproxy-0.4.15/debian/rules 2018-09-19 20:17:58.000000000 +0200
@@ -6,12 +6,14 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
+DO_PACKAGES = $(shell dh_listpackages)
+
+DH_ADDONS=--with=gnome
# only invoke dh --with cli if cli-common-dev is present
-WITH_CLI =
WITH_DOTNET = -DWITH_DOTNET=OFF
ifneq (,$(wildcard /usr/share/perl5/Debian/Debhelper/Sequence/cli.pm))
ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-WITH_CLI = --with cli
+DH_ADDONS += --with cli
WITH_DOTNET = -DWITH_DOTNET=ON
endif
endif
@@ -37,6 +39,13 @@
-DWITH_WEBKIT3=OFF
endif
+ifeq (,$(filter python-libproxy,$(DO_PACKAGES)))
+CONFIGURE_FLAGS += -DWITH_PYTHON2=OFF
+endif
+ifeq (,$(filter python3-libproxy,$(DO_PACKAGES)))
+CONFIGURE_FLAGS += -DWITH_PYTHON3=OFF
+endif
+
override_dh_auto_configure:
dh_auto_configure -- $(CONFIGURE_FLAGS)
@@ -60,4 +69,5 @@
dh_gencontrol -- -Vlibproxy=${libproxy}
%:
- dh $@ $(WITH_CLI) --with python2,python3,gnome
+ dh $@ $(DH_ADDONS)
+build binary %-indep: DH_ADDONS+=--with=python2,python3
