Package: libcaca
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 libcaca-0.99.beta19/debian/changelog libcaca-0.99.beta19/debian/changelog
--- libcaca-0.99.beta19/debian/changelog 2019-04-06 22:18:41.000000000 +0200
+++ libcaca-0.99.beta19/debian/changelog 2020-03-24 16:38:08.000000000 +0100
@@ -1,3 +1,11 @@
+libcaca (0.99.beta19-2.2) unstable; urgency=medium
+
+ * debian/tests/build:
+ - Use the correct compiler for proposed autopkgtest cross-testing
+ support.
+
+ -- Sebastien Bacher <seb...@ubuntu.com> Tue, 24 Mar 2020 16:38:08 +0100
+
libcaca (0.99.beta19-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru libcaca-0.99.beta19/debian/tests/build libcaca-0.99.beta19/debian/tests/build
--- libcaca-0.99.beta19/debian/tests/build 2014-05-16 21:30:34.000000000 +0200
+++ libcaca-0.99.beta19/debian/tests/build 2020-03-24 16:38:08.000000000 +0100
@@ -5,6 +5,12 @@
# Author: Vibhav Pant <vibh...@ubuntu.com>
set -e
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
@@ -28,7 +34,7 @@
}
EOF
-gcc -o caca_test caca_test.c `pkg-config --cflags --libs caca` -Wall -Werror
+${CROSS_COMPILE}gcc -o caca_test caca_test.c `${CROSS_COMPILE}pkg-config --cflags --libs caca` -Wall -Werror
echo "build: OK"
[ -x caca_test ]
export TERM=linux
