Package: libinih
Version: 53-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
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 libinih 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 libinih-53/debian/changelog libinih-53/debian/changelog
--- libinih-53/debian/changelog 2021-02-09 11:47:19.000000000 +0100
+++ libinih-53/debian/changelog 2021-03-01 23:43:57.000000000 +0100
@@ -1,3 +1,10 @@
+libinih (53-2) UNRELEASED; urgency=medium
+
+ * debian/tests/unittest.sh:
+ - set the CC environment to be cross-build friendly
+
+ -- Sebastien Bacher <seb...@ubuntu.com> Mon, 01 Mar 2021 23:43:57 +0100
+
libinih (53-1) unstable; urgency=medium
* New upstream release (Closes: #982351)
diff -Nru libinih-53/debian/tests/unittest.sh libinih-53/debian/tests/unittest.sh
--- libinih-53/debian/tests/unittest.sh 2021-02-09 11:47:19.000000000 +0100
+++ libinih-53/debian/tests/unittest.sh 2021-03-01 23:43:57.000000000 +0100
@@ -1,6 +1,10 @@
#!/bin/sh
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ export CC=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)-gcc
+fi
+
cd tests
make test
make clean
