Package: libraw
Version: 0.19.5-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
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 libxcb 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 libraw-0.19.5/debian/changelog libraw-0.19.5/debian/changelog
--- libraw-0.19.5/debian/changelog 2019-08-28 23:45:51.000000000 +0200
+++ libraw-0.19.5/debian/changelog 2020-03-24 16:36:35.000000000 +0100
@@ -1,3 +1,11 @@
+libraw (0.19.5-2) unstable; urgency=medium
+
+ * debian/tests/build:
+ - Use the correct compiler for proposed autopkgtest cross-testing
+ support.
+
+ -- Sebastien Bacher <seb...@debian.org> Tue, 24 Mar 2020 16:36:35 +0100
+
libraw (0.19.5-1) unstable; urgency=medium
* New upstream release
diff -Nru libraw-0.19.5/debian/tests/smoketest libraw-0.19.5/debian/tests/smoketest
--- libraw-0.19.5/debian/tests/smoketest 2018-07-18 21:27:03.000000000 +0200
+++ libraw-0.19.5/debian/tests/smoketest 2020-03-24 16:36:20.000000000 +0100
@@ -1,6 +1,12 @@
#!/bin/sh
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cd "$ADTTMP"
cat > test.c << EOF
#include <libraw/libraw.h>
@@ -15,6 +21,6 @@
}
EOF
-g++ -Wall -o test test.c -lraw
+${CROSS_COMPILE}g++ -Wall -o test test.c -lraw
./test
objdump -p test | grep "libraw"
