Package: libxcb
Version: 1.13.1-3
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch
Dear maintainers,
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 libxcb tests currently fail in this environment, because they 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
thisis 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,
diff -u libxcb-1.13.1/debian/changelog libxcb-1.13.1/debian/changelog
--- libxcb-1.13.1/debian/changelog
+++ libxcb-1.13.1/debian/changelog
@@ -1,3 +1,11 @@
+libxcb (1.13.1-3.1) UNRELEASED; urgency=medium
+
+ * debian/tests/build:
+ - Use the correct compiler for proposed autopkgtest cross-testing
+ support.
+
+ -- Sebastien Bacher <seb...@ubuntu.com> Wed, 08 Jan 2020 17:08:23 +0100
+
libxcb (1.13.1-3) unstable; urgency=medium
* Use python3 (closes: #936940).
diff -u libxcb-1.13.1/debian/tests/build libxcb-1.13.1/debian/tests/build
--- libxcb-1.13.1/debian/tests/build
+++ libxcb-1.13.1/debian/tests/build
@@ -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
@@ -27,7 +33,7 @@
}
EOF
-gcc -o libxcb_test libxcb_test.c `pkg-config --cflags --libs xcb` -Wall -Werror
+${CROSS_COMPILE}gcc -o libxcb_test libxcb_test.c `${CROSS_COMPILE}pkg-config --cflags --libs xcb` -Wall -Werror
echo "build: OK"
[ -x libxcb_test ]
xvfb-run ./libxcb_test
