From bbe675c06ac3bdfe7b0c9a712c9b31deb62e64bf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 12 Dec 2019 16:33:30 +0000
Subject: [PATCH] d/tests/build: Use correct compiler for cross-architecture
 testing

* d/tests/build: Use correct compiler for proposed autopkgtest
  cross-architecture testing support, based on a patch for clutter-1.0
  by Steve Langasek
* d/tests/build: Fix shellcheck warnings
---
 debian/changelog   |  9 +++++++++
 debian/tests/build | 18 +++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 765abb263e..66076a50f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gtk+3.0 (3.24.13-2) UNRELEASED; urgency=medium
+
+  * d/tests/build: Use correct compiler for proposed autopkgtest
+    cross-architecture testing support, based on a patch for clutter-1.0
+    by Steve Langasek
+  * d/tests/build: Fix shellcheck warnings
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 12 Dec 2019 16:32:10 +0000
+
 gtk+3.0 (3.24.13-1) unstable; urgency=medium
 
   [ Simon McVittie ]
diff --git a/debian/tests/build b/debian/tests/build
index 35dc3d0f9e..c70a9fd1f3 100755
--- a/debian/tests/build
+++ b/debian/tests/build
@@ -7,8 +7,18 @@
 set -e
 
 WORKDIR=$(mktemp -d)
-trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
-cd $WORKDIR
+cleanup () {
+    rm -fr "$WORKDIR"
+}
+trap cleanup 0 INT QUIT ABRT PIPE TERM
+cd "$WORKDIR"
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 cat <<EOF > gtktest.c
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -36,7 +46,9 @@ int main(int argc, char **argv)
 }
 EOF
 
-gcc -o gtktest gtktest.c `pkg-config --cflags --libs gtk+-3.0`
+# Deliberately word-splitting, that's how pkg-config works:
+# shellcheck disable=SC2046
+"${CROSS_COMPILE}gcc" -o gtktest gtktest.c $("${CROSS_COMPILE}pkg-config" --cflags --libs gtk+-3.0)
 echo "build: OK"
 [ -x gtktest ]
 xvfb-run -a -s "-screen 0 1024x768x24" \