Your message dated Sun, 02 Feb 2020 22:31:31 +0000
with message-id <[email protected]>
and subject line Bug#946496: fixed in libsdl2 2.0.10+dfsg1-2
has caused the Debian Bug report #946496,
regarding libsdl2: Please make autopkgtests cross-test-friendly
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
946496: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946496
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: libsdl2
Version: 2.0.10+dfsg1-1
Severity: minor
Tags: patch
User: [email protected]
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 libsdl2 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/
[email protected] [email protected]
diff -Nru libsdl2-2.0.10+dfsg1/debian/tests/build
libsdl2-2.0.10+dfsg1/debian/tests/build
--- libsdl2-2.0.10+dfsg1/debian/tests/build 2019-09-19 22:01:14.000000000
-0700
+++ libsdl2-2.0.10+dfsg1/debian/tests/build 2019-12-09 15:33:44.000000000
-0800
@@ -16,6 +16,13 @@
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cd $WORKDIR
cat <<EOF > use-sdl.c
#undef NDEBUG
@@ -53,10 +60,10 @@
case "$tool" in
(pkg-config)
- gcc $cflags -o use-${tool}-${mode} use-sdl.c `pkg-config $pcflags
--cflags --libs sdl2`
+ ${CROSS_COMPILE}gcc $cflags -o use-${tool}-${mode} use-sdl.c
`${CROSS_COMPILE}pkg-config $pcflags --cflags --libs sdl2`
;;
(sdl2-config)
- gcc $cflags -o use-${tool}-${mode} use-sdl.c `sdl2-config --cflags
$scflags`
+ ${CROSS_COMPILE}gcc $cflags -o use-${tool}-${mode} use-sdl.c
`sdl2-config --cflags $scflags`
;;
(*)
exit 1
diff -Nru libsdl2-2.0.10+dfsg1/debian/tests/build-all
libsdl2-2.0.10+dfsg1/debian/tests/build-all
--- libsdl2-2.0.10+dfsg1/debian/tests/build-all 2019-09-19 22:01:14.000000000
-0700
+++ libsdl2-2.0.10+dfsg1/debian/tests/build-all 2019-12-09 16:21:37.000000000
-0800
@@ -9,7 +9,19 @@
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ cat <<EOF > "$WORKDIR/toolchain.cmake"
+set(CMAKE_C_COMPILER $DEB_HOST_GNU_TYPE-gcc)
+set(CMAKE_CXX_COMPILER $DEB_HOST_GNU_TYPE-g++)
+set(PKG_CONFIG_EXECUTABLE $DEB_HOST_GNU_TYPE-pkg-config)
+EOF
+ CCFILE=-DCMAKE_TOOLCHAIN_FILE="$WORKDIR/toolchain.cmake"
+else
+ CCFILE=
+fi
+
cp -R * $WORKDIR
cd $WORKDIR
mkdir build && cd build
-cmake .. -DSDL_TEST=ON && make && make test
+cmake .. "$CCFILE" -DSDL_TEST=ON && make && make test
--- End Message ---
--- Begin Message ---
Source: libsdl2
Source-Version: 2.0.10+dfsg1-2
We believe that the bug you reported is fixed in the latest version of
libsdl2, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Felix Geyer <[email protected]> (supplier of updated libsdl2 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 02 Feb 2020 23:02:25 +0100
Source: libsdl2
Architecture: source
Version: 2.0.10+dfsg1-2
Distribution: unstable
Urgency: medium
Maintainer: Debian SDL packages maintainers
<[email protected]>
Changed-By: Felix Geyer <[email protected]>
Closes: 909740 946496
Changes:
libsdl2 (2.0.10+dfsg1-2) unstable; urgency=medium
.
[ Simon McVittie ]
* d/tests: Add a test that detecting SDL2 via CMake does not regress.
This is the sort of thing that could easily regress while solving #909740.
* Install all headers in an architecture-specific location.
This approach was suggested by Adrian Bunk on #909740, as one of several
possible ways to avoid SDL_config.h colliding between architectures.
Because this approach uses a different @includedir@ for each architecture,
we can no longer have @includedir@ in sdl2-config.in: that would result
in non-co-installability. However, simply removing it (similar to
no-libdir.patch) is not an option, because the SDL 2 headers are not
on the default include path (and they cannot be added to it without
breaking parallel-installability of SDL 1.2 or a hypothetical future
SDL 3). Instead, patch sdl-config.in to ask pkg-config for its CFLAGS
and LIBS. This can supersede the previous no-libdir.patch.
This relies on the assumption that cross-compilation will always set
PKG_CONFIG, even if that environment variable is not otherwise used by
the build system that is invoking sdl2-config.
The sdl2-config.cmake.in part of no-libdir.patch can simply be dropped,
because that file is installed to an architecture-specific location
anyway, namely ${libdir}/cmake.
* Mark libsdl2-dev as Multi-Arch: same (Closes: #909740)
.
[ Gianfranco Costamagna ]
* Upload part of Ubuntu delta to Debian
.
[ Timo Aaltonen ]
* rules: Disable GLES1, it's getting enabled because libgles-dev ships
GLES1 headers now, but they have conflicting types against the ones
SDL has.
.
[ Steve Langasek ]
* Make autopkgtests cross-test-friendly. (Closes: #946496)
.
[ Felix Geyer ]
* Drop build-all autopkgtest.
- We already have tests that check if building against SDL2 with
pkg-config,
sdl2-config and cmake works correctly.
- It has a large overhead as it rebuilds SDL2 and requires supporting
cmake as a second buildsystem.
* Add the non-multiarch include dir to pkg-config cflags for compatibility.
Checksums-Sha1:
b1959c77c201d3b39a6382b01f80cfff24af9d2c 2827 libsdl2_2.0.10+dfsg1-2.dsc
2d636f97998b493db73cb371c450f121a622f69c 19812
libsdl2_2.0.10+dfsg1-2.debian.tar.xz
Checksums-Sha256:
90c6848b04d27dbccc787396c4a662c64d7bffdf14caed491098e0aefd48ff41 2827
libsdl2_2.0.10+dfsg1-2.dsc
3302df95fed97908637fcfaa706f183c0fcd83140007c472fe7e1acdb1021776 19812
libsdl2_2.0.10+dfsg1-2.debian.tar.xz
Files:
70606ee0457c6ac09da40b6902aca4e9 2827 libs optional libsdl2_2.0.10+dfsg1-2.dsc
85d01559661a6c618dff83a5c6835f45 19812 libs optional
libsdl2_2.0.10+dfsg1-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEFkxwUS95KUdnZKtW/iLG/YMTXUUFAl43SscACgkQ/iLG/YMT
XUVJTxAAw0zcHslFmWbhRnmXbVatV1FpDysvaPj9vvClzrIVD7+NtVs5DgtaUZTq
I77S0yo0VAXQMPM+vBxQz05AcsRXYrUAXg0J6RDrFtwBhv/axNda2AhXadFGAhMb
ktWG7O/jNXI4TYGw1jV4PjmV3U6aME6kXk/BAqU2Vr/biCNgBhM83/IZF5A9q5xC
UsOwkBI8POABBOrKCLaGmnAlChHeMlv69XwuvwRWhLR3UMmw+Xf3Mp4QOCWJQACX
/NmRaKRQENXHB6NlVi824OoyIF9LtF2lQvz4BxM4GdAe4AKGFUxkgO4M/7h7WSFw
F7sgDi1dZpGoPnZ+WZzdPJKOpquB0MyeaXfBQMt1v99vodqKVvzgmE7Cpkn3UOzi
fPsO4fvc1K86vhF+0WBdUS/qKhkgqPMpdXYceXf4mB0QB5lMuSKTWpJxZIcPinuk
ay0s1SDt09R7PGjX8CBy93Ge/F5K4DG9dV8bP2O6bzZSORwLsRzeqDUNFSz0bmXn
4Pq/TW7Au5t19i5tLVQyB22YEo9aCMvnCk0dQt8zvT14t5aYo4LK1atiiuP4fQn0
9enq+hqyN+3FIQgeVM6xiBeVuxB1MgCQDaT6pNeiF6mNQG5OX2qaOs1nhlA3E/d2
KO0bGDrhFudsUmEBFD3E85qE7+a9fY5BQrNf79Y8PWlrta8HX9M=
=+Qu6
-----END PGP SIGNATURE-----
--- End Message ---
