Package: dwarfutils
Version: 20191104-1
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu focal ubuntu-patch
Hi Fabian,
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 dwarfutils tests currently fail in this environment, because they
include a build test that does 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/
[email protected] [email protected]
diff -Nru dwarfutils-20191104/debian/tests/include-test
dwarfutils-20191104/debian/tests/include-test
--- dwarfutils-20191104/debian/tests/include-test 2019-11-06
12:52:10.000000000 -0800
+++ dwarfutils-20191104/debian/tests/include-test 2020-01-10
10:40:18.000000000 -0800
@@ -4,6 +4,12 @@
# Make sure the libdwarf headers and library are installed and usable
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
TMPDIR=$(mktemp -d)
trap "rm -rf $TMPDIR" EXIT
cd $TMPDIR
@@ -14,6 +20,6 @@
int main () { return 0; }
EOF
-cc -o test-include test-include.c -ldwarf
+${CROSS_COMPILE}gcc -o test-include test-include.c -ldwarf
[ -x test-include ]
./test-include
