[pkg-gnupg-maint] Bug#950303: libgpg-error: Please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: libgpg-error
Version: 1.36-7
Severity: minor
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi Daniel,

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 libgpg-error 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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru libgpg-error-1.36/debian/tests/build libgpg-error-1.36/debian/tests/build
--- libgpg-error-1.36/debian/tests/build	2019-07-14 20:04:17.000000000 -0700
+++ libgpg-error-1.36/debian/tests/build	2020-01-30 23:38:12.000000000 -0800
@@ -2,6 +2,12 @@
 
 set -e
 
-gcc -pedantic -Wall -Werror -o test-run debian/tests/simple-build.c $(pkg-config --cflags --libs gpg-error)
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE=${DEB_HOST_GNU_TYPE}-
+else
+    CROSS_COMPILE=
+fi
+
+${CROSS_COMPILE}gcc -pedantic -Wall -Werror -o test-run debian/tests/simple-build.c $(${CROSS_COMPILE}pkg-config --cflags --libs gpg-error)
 ./test-run
 rm -f test-run