|
Package: libinput Version: 1.14.3-1 Severity: minor Tags: patch User: ubuntu-devel@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 libinput 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 libinput-1.14.3/debian/changelog libinput-1.14.3/debian/changelog
--- libinput-1.14.3/debian/changelog 2019-11-07 14:50:24.000000000 +0100
+++ libinput-1.14.3/debian/changelog 2019-12-11 09:41:34.000000000 +0100
@@ -1,3 +1,11 @@
+libinput (1.14.3-2) UNRELEASED; urgency=medium
+
+ * debian/tests/libssh-server:
+ - Use the correct compiler for proposed autopkgtest cross-testing
+ support.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 11 Dec 2019 09:37:38 +0100
+
libinput (1.14.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru libinput-1.14.3/debian/tests/build libinput-1.14.3/debian/tests/build
--- libinput-1.14.3/debian/tests/build 2019-11-07 13:27:59.000000000 +0100
+++ libinput-1.14.3/debian/tests/build 2019-12-11 09:40:39.000000000 +0100
@@ -3,6 +3,12 @@
exec 2>&1
set -eux
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cd "${AUTOPKGTEST_TMP:-"${ADTTMP}"}"
echo "1..2"
@@ -44,7 +50,7 @@
}
EOF
-gcc -o dynamic simple.c $(pkg-config --cflags --libs libinput)
+${CROSS_COMPILE}gcc -o dynamic simple.c $(${CROSS_COMPILE}pkg-config --cflags --libs libinput)
echo "ok 1 - compile dynamic executable"
test -x dynamic
./dynamic