Package: iproute2 Version: 3.9.0-4 Severity: normal Tags: patch Here's the fix for FTBFS on x32, split off the bigger patch in #713998. As per your request, I submitted it upstream, waited for it to be accepted, inserted into your gbp-pq workflow, extracted a pair of commits for pkg-iproute.
[mumble mumble quilt must die] Attached. Meow! -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (600, 'unstable'), (500, 'experimental') Architecture: x32 (x86_64) Kernel: Linux 3.9.4-x32 (SMP w/6 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages iproute2 depends on: ii libc6 2.17-6 ii libdb5.1 5.1.29-6 Versions of packages iproute2 recommends: ii libatm1 1:2.5.1-1.5 ii libxtables10 1.4.18-1 Versions of packages iproute2 suggests: pn iproute2-doc <none> -- no debconf information
>From 60078eb57a9a1d20d10d5939cad2fd26bfa31ca4 Mon Sep 17 00:00:00 2001 From: Adam Borowski <[email protected]> Date: Wed, 26 Jun 2013 16:20:57 +0200 Subject: [PATCH 1/2] Fix FTBFS on x32 (via upstream) Cherry-picked from upstream commit: https://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=5d8a75293c61e3f03f365398a8745f0d71331d02 --- ...x-build-failure-if-time_t-is-not-long-int.patch | 25 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) create mode 100644 debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch diff --git a/debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch b/debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch new file mode 100644 index 0000000..58cc8e4 --- /dev/null +++ b/debian/patches/0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch @@ -0,0 +1,25 @@ +From: Adam Borowski <[email protected]> +Date: Tue, 25 Jun 2013 01:39:21 +0200 +Subject: ip: fix build failure if time_t is not long int + +This includes x32, and, per Linus' decree, any future arch with longs +shorter than 64 bits. + +Signed-off-by: Adam Borowski <[email protected]> +--- + ip/iproute.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ip/iproute.c b/ip/iproute.c +index adef774..d3c56d3 100644 +--- a/ip/iproute.c ++++ b/ip/iproute.c +@@ -1330,7 +1330,7 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action) + + if (time(0) - start > 30) { + printf("\n*** Flush not completed after %ld seconds, %d entries remain ***\n", +- time(0) - start, filter.flushed); ++ (long)(time(0) - start), filter.flushed); + exit(1); + } + diff --git a/debian/patches/series b/debian/patches/series index d39e83c..df1b7ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-txtdocs.patch 0003-iproute2-fix-build-failure-on-sparc-due-to-Wformat-a.patch 0004-iproute2-patch-against-GCC-4.8.0.patch +0005-ip-fix-build-failure-if-time_t-is-not-long-int.patch -- 1.8.3.1
>From 51a2901bb018ca01ae5ca87e068aa40e956f10d7 Mon Sep 17 00:00:00 2001 From: Adam Borowski <[email protected]> Date: Wed, 26 Jun 2013 16:26:20 +0200 Subject: [PATCH 2/2] Update debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6b4d511..db01e08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +iproute2 (3.9.0-5) unstable; urgency=low + + * Fix FTBFS on x32 (via upstream) + + -- Adam Borowski <[email protected]> Wed, 26 Jun 2013 16:26:06 +0200 + iproute2 (3.9.0-4) unstable; urgency=low * Cherry-pick upstream patch to build with gcc 4.8.0 (Closes: #713998) -- 1.8.3.1
