Package: libuv1
Version: 1.33.1-2
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 libuv1 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/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru libuv1-1.33.1/debian/tests/control libuv1-1.33.1/debian/tests/control
--- libuv1-1.33.1/debian/tests/control  2019-10-31 09:49:00.000000000 -0700
+++ libuv1-1.33.1/debian/tests/control  2020-01-30 16:53:07.000000000 -0800
@@ -1,3 +1,3 @@
 Tests: run-tests
 Restrictions: allow-stderr
-Depends: @, gyp, gcc, libc-dev, g++
+Depends: @, gyp:native, build-essential
diff -Nru libuv1-1.33.1/debian/tests/run-tests 
libuv1-1.33.1/debian/tests/run-tests
--- libuv1-1.33.1/debian/tests/run-tests        2019-10-31 09:49:00.000000000 
-0700
+++ libuv1-1.33.1/debian/tests/run-tests        2020-01-30 16:53:07.000000000 
-0800
@@ -5,8 +5,14 @@
 echo "creating makefile for tests"
 ./gyp_uv.py -f make
 
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE=${DEB_HOST_GNU_TYPE}-
+else
+    CROSS_COMPILE=
+fi
+
 echo "creating test binaries"
-make -C out
+make -C out CC=${CROSS_COMPILE}gcc LINK=${CROSS_COMPILE}gcc
 
 echo "Runing tests"
 ./out/Debug/run-tests

Reply via email to