Package: libthai Version: 0.1.28-3 Severity: minor Tags: patch User: [email protected] Usertags: origin-ubuntu hirsute 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 libthai 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 libthai-0.1.28/debian/changelog libthai-0.1.28/debian/changelog --- libthai-0.1.28/debian/changelog 2019-08-27 02:56:02.000000000 +0200 +++ libthai-0.1.28/debian/changelog 2021-02-25 09:35:10.000000000 +0100 @@ -1,3 +1,10 @@ +libthai (0.1.28-3.1) UNRELEASED; urgency=medium + + * debian/tests/build: + - Make autopkgtests cross-test-friendly. + + -- Sebastien Bacher <[email protected]> Thu, 25 Feb 2021 09:35:10 +0100 + libthai (0.1.28-3) unstable; urgency=medium * d/gbp.conf: Use --source-only-changes by default diff -Nru libthai-0.1.28/debian/tests/build libthai-0.1.28/debian/tests/build --- libthai-0.1.28/debian/tests/build 2019-08-27 02:56:02.000000000 +0200 +++ libthai-0.1.28/debian/tests/build 2021-02-25 09:34:46.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 > libthaitest.c #include <thai/tis.h> #include <thai/thinp.h> @@ -19,7 +26,7 @@ } EOF -gcc -o libthaitest libthaitest.c $(pkg-config --cflags --libs libthai) +${CROSS_COMPILE}gcc -o libthaitest libthaitest.c $(${CROSS_COMPILE}pkg-config --cflags --libs libthai) echo "build: OK" [ -x libthaitest ] ./libthaitest
