Control: tags -1 + patch

On 2018-09-08 09:10 +0200, Sven Joachim wrote:

> Source: gdk-pixbuf
> Version: 2.38.0+dfsg-2
> Severity: serious
> Tags: ftbfs
>
> The attempt to fix the test timeouts on slow arches in 2.38.0+dfsg-2 has
> introduced a new FTBFS problem on i386[1]:
>
> ,----
> |    debian/rules override_dh_auto_test
> | make[1]: Entering directory '/<<BUILDDIR>>/gdk-pixbuf-2.38.0+dfsg'
> | # on slow arches the "slow" tests take longer than the timeout allowed
> | # by upstream; allow even more time (-t is a multipiler)
> | meson test -C /<<BUILDDIR>>/gdk-pixbuf-2.38.0+dfsg/obj-i386-linux-gnu -t 5
> | Only ninja backend is supported to rebuild tests before running them.
> | Meson test encountered an error:
> | 
> | Directory $'/<<BUILDDIR>>/gdk-pixbuf-2.38.0+dfsg/obj-i386-linux-gnu' does 
> not seem to be a Meson build directory.
> | make[1]: *** [debian/rules:26: override_dh_auto_test] Error 1
> `----
>
> Will send a patch as soon as I have the bug number.

Here it is, tested in an i386 sbuild chroot. :-)

>From 8d9f4796631dadb3bb7942ce1d1602940366bca3 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenj...@gmx.de>
Date: Sat, 8 Sep 2018 09:15:54 +0200
Subject: [PATCH] Fix FTBFS on any-i386

The build directory is named after $(DEB_HOST_GNU_TYPE) rather than
$(DEB_HOST_MULTIARCH), and on any-i386 those are different.

Closes: #908298
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 88301a7c..dd9dac7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ infiles := \
 override_dh_auto_test:
 	# on slow arches the "slow" tests take longer than the timeout allowed
 	# by upstream; allow even more time (-t is a multipiler)
-	meson test -C $(CURDIR)/obj-$(DEB_HOST_MULTIARCH) -t 5
+	meson test -C $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) -t 5
 
 override_dh_install:
 	find $(CURDIR)/debian/tmp -name *.la -print -delete
-- 
2.19.0.rc2

Reply via email to