control: tags -1 patch pending this change and the python->python2 move is now in deferred/10
diff attached G. On Mon, 09 Mar 2020 22:29:10 -0700 Steve Langasek <steve.langa...@canonical.com> wrote: > Package: snowball > Version: 0+svn585-1.1 > Severity: minor > Tags: patch > User: ubuntu-de...@lists.ubuntu.com > Usertags: origin-ubuntu focal ubuntu-patch > > Hi Stefano, > > 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 snowball tests currently fail in this environment, because one test is 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/ > slanga...@ubuntu.com vor...@debian.org
diff -Nru snowball-0+svn585/debian/changelog snowball-0+svn585/debian/changelog --- snowball-0+svn585/debian/changelog 2019-09-14 04:08:28.000000000 +0200 +++ snowball-0+svn585/debian/changelog 2020-03-10 13:34:54.000000000 +0100 @@ -1,3 +1,11 @@ +snowball (0+svn585-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Make autopkgtests cross-test-friendly. (Closes: #953525) + * Use python2 to build + + -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 10 Mar 2020 13:34:54 +0100 + snowball (0+svn585-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru snowball-0+svn585/debian/control snowball-0+svn585/debian/control --- snowball-0+svn585/debian/control 2019-09-14 04:08:25.000000000 +0200 +++ snowball-0+svn585/debian/control 2020-03-10 13:33:19.000000000 +0100 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Stefano Rivera <stefa...@debian.org> -Build-Depends: debhelper (>= 9), dh-exec, python +Build-Depends: debhelper (>= 9), dh-exec, python2 Standards-Version: 3.9.6 Homepage: http://snowball.tartarus.org/ Vcs-Git: https://salsa.debian.org/debian/snowball.git diff -Nru snowball-0+svn585/debian/tests/compilation snowball-0+svn585/debian/tests/compilation --- snowball-0+svn585/debian/tests/compilation 2019-09-14 04:06:36.000000000 +0200 +++ snowball-0+svn585/debian/tests/compilation 2020-03-10 06:24:51.000000000 +0100 @@ -3,6 +3,12 @@ cd "$AUTOPKGTEST_TMP" +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + cat > test.c << EOF #include <stdio.h> #include <stdlib.h> @@ -27,8 +33,8 @@ } EOF -gcc -o test test.c -l stemmer +${CROSS_COMPILE}gcc -o test test.c -l stemmer ./test -gcc -o test test.c -static -l stemmer +${CROSS_COMPILE}gcc -o test test.c -static -l stemmer ./test
