Package: raqm Version: 0.7.0-3 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 raqm 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 raqm-0.7.0/debian/changelog raqm-0.7.0/debian/changelog --- raqm-0.7.0/debian/changelog 2019-07-07 04:36:51.000000000 +0200 +++ raqm-0.7.0/debian/changelog 2019-12-11 09:53:17.000000000 +0100 @@ -1,3 +1,11 @@ +raqm (0.7.0-4) unstable; 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:56:08 +0100 + raqm (0.7.0-3) unstable; urgency=medium * d/rules: override dh_auto_configure to pass --enable-gtk-doc option diff -Nru raqm-0.7.0/debian/tests/build raqm-0.7.0/debian/tests/build --- raqm-0.7.0/debian/tests/build 2019-07-07 04:36:51.000000000 +0200 +++ raqm-0.7.0/debian/tests/build 2019-12-10 11:58:04.000000000 +0100 @@ -7,6 +7,13 @@ WORKDIR=$(mktemp -d) trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM cd $WORKDIR + +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + cat <<EOF > raqmtest.c #include <raqm.h> @@ -19,7 +26,7 @@ } EOF -gcc -o raqmtest raqmtest.c `pkg-config --cflags --libs raqm` +${CROSS_COMPILE}gcc -o raqmtest raqmtest.c `pkg-config --cflags --libs raqm` echo "build: OK" [ -x raqmtest ] ./raqmtest
