Package: dbus Version: 1.12.16-2 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 dbus tests currently fail in this environment, because they include 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 dbus-1.12.16/debian/tests/build dbus-1.12.16/debian/tests/build --- dbus-1.12.16/debian/tests/build 2019-09-30 00:47:02.000000000 -0700 +++ dbus-1.12.16/debian/tests/build 2019-12-06 21:22:14.000000000 -0800 @@ -12,6 +12,12 @@ cd "$AUTOPKGTEST_TMP" +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + echo "1..1" cat > connect.c <<'EOF' @@ -42,7 +48,7 @@ # We don't exercise static linking because libsystemd is not available # as a static library. -gcc -o connect connect.c $(pkg-config --cflags --libs dbus-1) +${CROSS_COMPILE}gcc -o connect connect.c $(${CROSS_COMPILE}pkg-config --cflags --libs dbus-1) test -x connect dbus-run-session -- ./connect echo "# everything seems OK"