Package: libiptcdata
Version: 1.0.5-2.1
Severity: minor
Tags: patch
User: [email protected]
Usertags: origin-ubuntu focal ubuntu-patch
Hi Ian,
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 libiptcdata 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 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 libiptcdata-1.0.5/debian/tests/build
libiptcdata-1.0.5/debian/tests/build
--- libiptcdata-1.0.5/debian/tests/build 2019-02-24 08:12:43.000000000
-0800
+++ libiptcdata-1.0.5/debian/tests/build 2020-01-10 07:55:16.000000000
-0800
@@ -6,6 +6,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
MYDIR=$(dirname $(readlink -f $0))
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
@@ -27,7 +33,7 @@
}
EOF
-gcc -o libiptcdata_test libiptcdata_test.c -liptcdata -Wall -Werror
+${CROSS_COMPILE}gcc -o libiptcdata_test libiptcdata_test.c -liptcdata -Wall
-Werror
echo "build: OK"
uudecode -o $WORKDIR/sample.jpeg $MYDIR/sample.jpeg.base64
[ -x libiptcdata_test ]
