Package: libpipeline
Version: 1.5.2-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi Colin,

In Ubuntu, we are in the process of moving the i386 architecture to a
compatibility-only layer on amd64, and therefore we are also moving our
autopkgtest infrastructure to test i386 binaries in a cross-environment.

This requires changes to some tests so that they are cross-aware and can do
the right thing.

The libpipeline tests currently fail in this environment, because there are
build tests that do not invoke the toolchain in a cross-aware manner.  I've
verified that the attached patch lets the tests successfully build (and run)
i386 tests on an amd64 host.

Note that upstream autopkgtest doesn't currently set DEB_HOST_ARCH so this
is a complete no-op in Debian for the moment.  Support for cross-testing in
autopkgtest is currently awaiting review at
https://salsa.debian.org/ci-team/autopkgtest/merge_requests/69 and once
landed, will still have no effect unless autopkgtest is invoked with a '-a'
option.  So this change should be safe to land in your package despite this
not being upstream in autopkgtest.

Thanks for considering,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru libpipeline-1.5.2/debian/tests/build 
libpipeline-1.5.2/debian/tests/build
--- libpipeline-1.5.2/debian/tests/build        2020-01-01 08:29:38.000000000 
-0800
+++ libpipeline-1.5.2/debian/tests/build        2020-01-09 08:45:19.000000000 
-0800
@@ -6,6 +6,12 @@
 
 set -e
 
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 WORKDIR="$(mktemp -d)"
 trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
 cd "$WORKDIR"
@@ -24,8 +30,8 @@
 
 EOF
 
-gcc -o libpipeline_test libpipeline_test.c \
-       $(pkg-config --cflags --libs libpipeline) -Wall -Werror
+${CROSS_COMPILE}gcc -o libpipeline_test libpipeline_test.c \
+       $(${CROSS_COMPILE}pkg-config --cflags --libs libpipeline) -Wall -Werror
 echo "build: OK"
 [ -x libpipeline_test ]
 ./libpipeline_test

Reply via email to