Package: aom Version: 1.0.0.errata1-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 aom 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 aom-1.0.0.errata1/debian/tests/library-build aom-1.0.0.errata1/debian/tests/library-build --- aom-1.0.0.errata1/debian/tests/library-build 2019-09-01 05:28:49.000000000 -0700 +++ aom-1.0.0.errata1/debian/tests/library-build 2019-12-05 15:26:36.000000000 -0800 @@ -10,10 +10,14 @@ cp debian/tests/library-build.c "$AUTOPKGTEST_TMP" cd "$AUTOPKGTEST_TMP" +if [ -n "$DEB_HOST_MULTIARCH" ]; then + export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig" + PREFIX="$DEB_HOST_GNU_TYPE-" +fi # Compile with and without pkg-config -gcc -Wall -Wextra -O2 library-build.c -o build1 -laom +${PREFIX}gcc -Wall -Wextra -O2 library-build.c -o build1 -laom echo "build1: compiled" -gcc -Wall -Wextra -O2 $(pkg-config --cflags aom) library-build.c -o build2 $(pkg-config --libs aom) +${PREFIX}gcc -Wall -Wextra -O2 $(pkg-config --cflags aom) library-build.c -o build2 $(pkg-config --libs aom) echo "build2: compiled" # Run the tests