Source: iodine
Version: 0.7.0-8
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
src/osflags hard codes the build architecture pkg-config. After making
it substitutable and substituting it (dh_auto_build only supplies it as
a make variable). iodine cross builds successfully. Please consider
applying the attached patch.
Helmut
diff --minimal -Nru iodine-0.7.0/debian/changelog iodine-0.7.0/debian/changelog
--- iodine-0.7.0/debian/changelog 2018-05-15 23:32:00.000000000 +0200
+++ iodine-0.7.0/debian/changelog 2019-02-09 07:33:00.000000000 +0100
@@ -1,3 +1,10 @@
+iodine (0.7.0-8.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Use a triplet-prefixed pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 09 Feb 2019 07:33:00 +0100
+
iodine (0.7.0-8) unstable; urgency=medium
* New version of iodine-client-start (1.0.6 + one commit) pulled from
diff --minimal -Nru iodine-0.7.0/debian/patches/cross.patch
iodine-0.7.0/debian/patches/cross.patch
--- iodine-0.7.0/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ iodine-0.7.0/debian/patches/cross.patch 2019-02-09 07:32:12.000000000
+0100
@@ -0,0 +1,29 @@
+--- iodine-0.7.0.orig/src/osflags
++++ iodine-0.7.0/src/osflags
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++: "${PKG_CONFIG:=pkg-config}"
++
+ case $2 in
+ link)
+
+@@ -19,7 +21,8 @@
+ Linux)
+ FLAGS="";
+ [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS
-lselinux";
+- [ -e /usr/include/systemd/sd-daemon.h ] &&
FLAGS="$FLAGS $(pkg-config --libs libsystemd)";
++
++ "$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS
$($PKG_CONFIG --libs libsystemd)"
+ echo $FLAGS;
+ ;;
+ esac
+@@ -35,7 +38,7 @@
+ Linux)
+ FLAGS="-D_GNU_SOURCE"
+ [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS
-DHAVE_SETCON";
+- [ -e /usr/include/systemd/sd-daemon.h ] &&
FLAGS="$FLAGS -DHAVE_SYSTEMD";
++ "$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS
-DHAVE_SYSTEMD";
+ echo $FLAGS;
+ ;;
+ GNU/kFreeBSD|GNU)
diff --minimal -Nru iodine-0.7.0/debian/patches/series
iodine-0.7.0/debian/patches/series
--- iodine-0.7.0/debian/patches/series 2018-05-15 23:32:00.000000000 +0200
+++ iodine-0.7.0/debian/patches/series 2019-02-09 07:30:44.000000000 +0100
@@ -2,3 +2,4 @@
verbose-build.patch
0001-osflags-use-pkg-config-for-systemd-support.patch
kfreebsd-hurd.patch
+cross.patch
diff --minimal -Nru iodine-0.7.0/debian/rules iodine-0.7.0/debian/rules
--- iodine-0.7.0/debian/rules 2018-05-15 23:32:00.000000000 +0200
+++ iodine-0.7.0/debian/rules 2019-02-09 07:32:46.000000000 +0100
@@ -4,6 +4,8 @@
TMP = $(CURDIR)/debian/$(PACKAGE)
export DEB_BUILD_MAINT_OPTIONS := hardening=+pie,+bindnow
+-include /usr/share/dpkg/buildtools.mk
+export PKG_CONFIG ?= pkg-config
%:
dh $@
