Package: libwacom Version: 1.1-2 Severity: minor Tags: patch User: [email protected] 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 libwacom 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 -Nru libwacom-1.1/debian/changelog libwacom-1.1/debian/changelog --- libwacom-1.1/debian/changelog 2019-11-21 17:20:24.000000000 +0100 +++ libwacom-1.1/debian/changelog 2019-12-10 17:42:47.000000000 +0100 @@ -1,3 +1,11 @@ +libwacom (1.1-3) UNRELEASED; urgency=medium + + * debian/tests/libssh-server: + - Use the correct compiler for proposed autopkgtest cross-testing + support. + + -- Sebastien Bacher <[email protected]> Tue, 10 Dec 2019 11:07:03 +0100 + libwacom (1.1-2) unstable; urgency=medium [ Simon McVittie ] diff -Nru libwacom-1.1/debian/tests/build libwacom-1.1/debian/tests/build --- libwacom-1.1/debian/tests/build 2019-10-17 20:54:59.000000000 +0200 +++ libwacom-1.1/debian/tests/build 2019-12-10 14:31:18.000000000 +0100 @@ -4,6 +4,12 @@ exec 2>&1 set -u +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + cd "$AUTOPKGTEST_TMP" echo "1..1" @@ -26,7 +32,7 @@ # Deliberately word-splitting, that's how pkg-config works: # shellcheck disable=SC2046 -gcc -o trivial trivial.c $(pkg-config --cflags --libs libwacom) +${CROSS_COMPILE}gcc -o trivial trivial.c $(${CROSS_COMPILE}pkg-config --cflags --libs libwacom) test -x trivial ./trivial echo "ok 1"
