Bug#946361: at-spi2-core: Please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: at-spi2-core
Followup-For: Bug #946361
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Sorry, the previous patch was incomplete.  Please see attached a complete patch.

Thanks,
-- 
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 at-spi2-core-2.34.0/debian/tests/control at-spi2-core-2.34.0/debian/tests/control
--- at-spi2-core-2.34.0/debian/tests/control	2019-09-29 05:38:10.000000000 -0700
+++ at-spi2-core-2.34.0/debian/tests/control	2019-12-07 12:21:52.000000000 -0800
@@ -1,2 +1,2 @@
 Tests: gedit dbind
-Depends: libatspi2.0-dev, build-essential, xauth, xvfb, dbus, at-spi2-core, gedit
+Depends: libatspi2.0-dev, build-essential, xauth, xvfb, dbus, at-spi2-core, gedit:native
diff -Nru at-spi2-core-2.34.0/debian/tests/dbind at-spi2-core-2.34.0/debian/tests/dbind
--- at-spi2-core-2.34.0/debian/tests/dbind	2019-09-29 05:38:10.000000000 -0700
+++ at-spi2-core-2.34.0/debian/tests/dbind	2019-12-07 16:03:25.000000000 -0800
@@ -3,10 +3,20 @@
 set -e
 
 WORKDIR=$AUTOPKGTEST_TMP
-gcc dbind/dbtest.c -o $WORKDIR/dbtest  \
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
+${CROSS_COMPILE}gcc dbind/dbtest.c -o $WORKDIR/dbtest  \
 	-I . \
-	$(pkg-config --cflags glib-2.0) $(pkg-config --libs glib-2.0) \
-	$(pkg-config --cflags dbus-1) $(pkg-config --libs dbus-1) \
-	$(pkg-config --cflags atspi-2) $(pkg-config --libs atspi-2)
+	$(${CROSS_COMPILE}pkg-config --cflags glib-2.0) \
+	$(${CROSS_COMPILE}pkg-config --libs glib-2.0) \
+	$(${CROSS_COMPILE}pkg-config --cflags dbus-1) \
+	$(${CROSS_COMPILE}pkg-config --libs dbus-1) \
+	$(${CROSS_COMPILE}pkg-config --cflags atspi-2) \
+	$(${CROSS_COMPILE}pkg-config --libs atspi-2)
 
 exec dbus-run-session $WORKDIR/dbtest
diff -Nru at-spi2-core-2.34.0/debian/tests/gedit at-spi2-core-2.34.0/debian/tests/gedit
--- at-spi2-core-2.34.0/debian/tests/gedit	2019-09-29 05:38:10.000000000 -0700
+++ at-spi2-core-2.34.0/debian/tests/gedit	2019-12-07 16:03:49.000000000 -0800
@@ -3,8 +3,17 @@
 set -e
 
 WORKDIR=$AUTOPKGTEST_TMP
-gcc test/memory.c -o $WORKDIR/memory  \
-	$(pkg-config --cflags atspi-2) $(pkg-config --libs atspi-2) \
-	$(pkg-config --cflags gobject-2.0) $(pkg-config --libs gobject-2.0)
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
+${CROSS_COMPILE}gcc test/memory.c -o $WORKDIR/memory  \
+	$(${CROSS_COMPILE}pkg-config --cflags atspi-2) \
+	$(${CROSS_COMPILE}pkg-config --libs atspi-2) \
+	$(${CROSS_COMPILE}pkg-config --cflags gobject-2.0) \
+	$(${CROSS_COMPILE}pkg-config --libs gobject-2.0)
 
 exec xvfb-run -s -noreset -a dbus-run-session --dbus-daemon debian/tests/dbus-daemon -- $WORKDIR/memory