Bug#946416: gtkmm2.4: Please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: gtkmm2.4
Version: 1:2.24.5-4
Severity: minor
Tags: patch
User: ubuntu-devel at 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 gtkmm2.4 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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru gtkmm2.4-2.24.5/debian/tests/build gtkmm2.4-2.24.5/debian/tests/build
--- gtkmm2.4-2.24.5/debian/tests/build	2019-02-06 00:54:15.000000000 -0800
+++ gtkmm2.4-2.24.5/debian/tests/build	2019-12-08 11:38:31.000000000 -0800
@@ -23,6 +23,12 @@
 
 cd "$WORKDIR"
 
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 cat <<EOF > gtktest.cc
 #include <iostream>
 
@@ -60,9 +66,9 @@
 }
 EOF
 
-g++ -o pixbuf-demo pixbuf-demo.cc `pkg-config --cflags --libs gtkmm-2.4`
-g++ -o gtk-demo/gtk-demo gtk-demo/*.cc -DHAVE_GETC_UNLOCKED -DDEMOCODEDIR=\"${WORKDIR}\" `pkg-config --cflags --libs gtkmm-2.4`
-g++ -o gtktest gtktest.cc `pkg-config --cflags --libs gtkmm-2.4`
+${CROSS_COMPILE}g++ -o pixbuf-demo pixbuf-demo.cc `${CROSS_COMPILE}pkg-config --cflags --libs gtkmm-2.4`
+${CROSS_COMPILE}g++ -o gtk-demo/gtk-demo gtk-demo/*.cc -DHAVE_GETC_UNLOCKED -DDEMOCODEDIR=\"${WORKDIR}\" `${CROSS_COMPILE}pkg-config --cflags --libs gtkmm-2.4`
+${CROSS_COMPILE}g++ -o gtktest gtktest.cc `${CROSS_COMPILE}pkg-config --cflags --libs gtkmm-2.4`
 echo "build: OK"
 [ -x gtktest ]
 xvfb-run -a -s "-screen 0 1024x768x24" \