--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: Please make autopkgtests cross-test-friendly
- From: Sebastien Bacher <seb128@ubuntu.com>
- Date: Tue, 10 Dec 2019 16:17:31 +0100
- Message-id: <19c03064-c675-a5bd-4ffc-5d813db615d9@ubuntu.com>
Package: libopenmpt
Version: 0.4.10-1
Severity: minor
Tags: patch
User: ubuntu-devel@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 libopenmpt 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,
diff -Nru libopenmpt-0.4.10/debian/changelog libopenmpt-0.4.10/debian/changelog
--- libopenmpt-0.4.10/debian/changelog 2019-10-31 00:22:01.000000000 +0100
+++ libopenmpt-0.4.10/debian/changelog 2019-12-10 16:12:45.000000000 +0100
@@ -1,3 +1,9 @@
+libopenmpt (0.4.10-2) UNRELEASED; urgency=medium
+
+ * Make autopkgtests cross-test-friendly.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 10 Dec 2019 11:01:27 +0100
+
libopenmpt (0.4.10-1) unstable; urgency=medium
[ James Cowgill ]
diff -Nru libopenmpt-0.4.10/debian/tests/build libopenmpt-0.4.10/debian/tests/build
--- libopenmpt-0.4.10/debian/tests/build 2019-10-31 00:22:01.000000000 +0100
+++ libopenmpt-0.4.10/debian/tests/build 2019-12-10 16:15:29.000000000 +0100
@@ -10,6 +10,12 @@
exit 1
fi
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cd debian/tests
# Runs argument on the test data and ensures it's matches expected result
@@ -22,14 +28,14 @@
}
# Build programs
-gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-c1" pattern-dump-c.c -lopenmpt
+${CROSS_COMPILE}gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-c1" pattern-dump-c.c -lopenmpt
echo "build1: OK"
-gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-c2" pattern-dump-c.c $(pkg-config --cflags --libs libopenmpt)
+${CROSS_COMPILE}gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-c2" pattern-dump-c.c $(${CROSS_COMPILE}pkg-config --cflags --libs libopenmpt)
echo "build2: OK"
-g++ -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-cpp1" pattern-dump-cpp.cpp -lopenmpt
+${CROSS_COMPILE}g++ -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-cpp1" pattern-dump-cpp.cpp -lopenmpt
echo "build3: OK"
-g++ -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-cpp2" pattern-dump-cpp.cpp $(pkg-config --cflags --libs libopenmpt)
+${CROSS_COMPILE}g++ -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-cpp2" pattern-dump-cpp.cpp $(${CROSS_COMPILE}pkg-config --cflags --libs libopenmpt)
echo "build4: OK"
# Run them
diff -Nru libopenmpt-0.4.10/debian/tests/build-modplug libopenmpt-0.4.10/debian/tests/build-modplug
--- libopenmpt-0.4.10/debian/tests/build-modplug 2019-10-31 00:22:01.000000000 +0100
+++ libopenmpt-0.4.10/debian/tests/build-modplug 2019-12-10 12:29:46.000000000 +0100
@@ -12,6 +12,12 @@
exit 1
fi
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cd debian/tests
# Runs argument on the test data and ensures it's matches expected result
@@ -24,9 +30,9 @@
}
# Build programs
-gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-modplug1" pattern-dump-modplug.c -lmodplug
+${CROSS_COMPILE}gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-modplug1" pattern-dump-modplug.c -lmodplug
echo "build1: OK"
-gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-modplug2" pattern-dump-modplug.c $(pkg-config --cflags --libs libmodplug)
+${CROSS_COMPILE}gcc -Wall -o "$AUTOPKGTEST_TMP/pattern-dump-modplug2" pattern-dump-modplug.c $(${CROSS_COMPILE}pkg-config --cflags --libs libmodplug)
echo "build2: OK"
# Run them
--- End Message ---
--- Begin Message ---
Source: libopenmpt-modplug
Source-Version: 0.8.9.0-openmpt1-1
Done: Sebastian Ramacher <sramacher@debian.org>
We believe that the bug you reported is fixed in the latest version of
libopenmpt-modplug, 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 946530@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sebastian Ramacher <sramacher@debian.org> (supplier of updated libopenmpt-modplug 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 ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 17 Aug 2021 22:24:26 +0200
Binary: libopenmpt-modplug1 libopenmpt-modplug1-dbgsym libopenmpt-modplug-dev
Source: libopenmpt-modplug
Architecture: amd64 source
Version: 0.8.9.0-openmpt1-1
Distribution: experimental
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: Sebastian Ramacher <sramacher@debian.org>
Closes: 946530 958377
Description:
libopenmpt-modplug1 - module music library based on OpenMPT -- modplug compat library
libopenmpt-modplug-dev - module music library based on OpenMPT -- modplug compat developme
Changes:
libopenmpt-modplug (0.8.9.0-openmpt1-1) experimental; urgency=medium
.
[ Sebastien Bacher ]
* Make autopkgtests cross-test-friendly (Closes: #946530)
.
[ Sebastian Ramacher ]
* Split off libopenmpt-modplug from libopenmpt following upstream split
(Closes: #958377)
- debian/control: Reduce Build-Depends to debhelper, libopenmpt-dev and
pkg-config
- debian/rules: Remove libopenmpt specific overrides
- debian/tests: Remove libopenmpt tests
- debian/patches: Refresh patches
- debian/watch: Look for libopenmpt-modplug
- debian/copyright: Update copyright years and add myself
Checksums-Sha1:
be0e990b5ccf550e305a91e048bc2e2f567d3c4a 2349 libopenmpt-modplug_0.8.9.0-openmpt1-1.dsc
c4a82852b2105c182b0fe43453258f9d1e61a989 399316 libopenmpt-modplug_0.8.9.0-openmpt1.orig.tar.gz
82eeef99e1ffb3f031ae7ac398afeb239953ab1a 10412 libopenmpt-modplug_0.8.9.0-openmpt1-1.debian.tar.xz
9cc579d959d5b5942381de28e640970d93403269 19308 libopenmpt-modplug-dev_0.8.9.0-openmpt1-1_amd64.deb
bc0f1201d9faea3e5ae58cd2f2da0a1f190896b4 97744 libopenmpt-modplug1-dbgsym_0.8.9.0-openmpt1-1_amd64.deb
ab60bcb7987aad813052d97e379e2542c4a18ac4 22440 libopenmpt-modplug1_0.8.9.0-openmpt1-1_amd64.deb
Checksums-Sha256:
6daa21ce295ba9a965083a0efe6a057e0017a6d24180d373d2a45e6efeac3ad1 2349 libopenmpt-modplug_0.8.9.0-openmpt1-1.dsc
ecce1a0eecfdb0b5824cab89c270dce59596295a2c17c2b043215ecf4d7c4ff7 399316 libopenmpt-modplug_0.8.9.0-openmpt1.orig.tar.gz
f78de5a9bffd26097eecec8c5cbbf57d0e664f7b86fd857f3d1615391863d154 10412 libopenmpt-modplug_0.8.9.0-openmpt1-1.debian.tar.xz
0cdbf444078cba3d213dd6418614b425f13eec145fdf9c84a938dadab791234b 19308 libopenmpt-modplug-dev_0.8.9.0-openmpt1-1_amd64.deb
850776006dcb15f8d43554c8f23f81786de4f6a1c9cd44fed138b5d701eb86fd 97744 libopenmpt-modplug1-dbgsym_0.8.9.0-openmpt1-1_amd64.deb
87995a0a67079c2dd71b1443c97f8aa8a6c331129152b889b76c98a50b458bd3 22440 libopenmpt-modplug1_0.8.9.0-openmpt1-1_amd64.deb
Files:
43559b2b8993062ce93ce750b472d0d9 2349 libs optional libopenmpt-modplug_0.8.9.0-openmpt1-1.dsc
f6bb265d4913af1ea926bd86ffac5c18 399316 libs optional libopenmpt-modplug_0.8.9.0-openmpt1.orig.tar.gz
b1cd2a00ff8cbf86c538bbb6b868675e 10412 libs optional libopenmpt-modplug_0.8.9.0-openmpt1-1.debian.tar.xz
72532b4dd382716dd97e98a17861b958 19308 libdevel optional libopenmpt-modplug-dev_0.8.9.0-openmpt1-1_amd64.deb
82f0334dd209c12cf435efc590963937 97744 debug optional libopenmpt-modplug1-dbgsym_0.8.9.0-openmpt1-1_amd64.deb
eab24be2ff77a5ba2c2f40d653701eef 22440 libs optional libopenmpt-modplug1_0.8.9.0-openmpt1-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE94y6B4F7sUmhHTOQafL8UW6nGZMFAmEcHMwACgkQafL8UW6n
GZMMAQ/+Lde5a5TdgrogN10GAQSIoH+EfChRWHBPJksxisMwYncD0XTtJjOwWDsS
A45nL36cDLKvtaIuHba6DmvceWSTPX0y8/hikWrkYMR4mlqQqBsYfMOzevfkXkiN
orpcHFXfCZWS0b8yy1u0aRBNeD1PHBW7K2Iw7J6Lb9BYZaw5rAhl8Ux0VUskNBVH
uKU44yxOeNsgnd2eXkMAj76k6IkMqc5gVc8o+F2h43/Itn/GSwVdTxJW8bKNt7NO
8Tb9LBD6sjO36S6m+bZNYcvfJ/M31A5jmwSfI0BZnOOarb5y6Rn4hFhzJGh9E+/c
qa+xUlECEhXXsRjVDDV8BtdXJQX/d/swjSj8bmOJl8J/cLALCMLCpXY7+schl6/Q
zuRbTGJfiEc/1ZpEhLq0z+epU/6Z6FW7+5WVQt098cDp44d37cUCUM3aFhU7AXrD
xw9jxHS8d+p1w2drMnzHGscSMnSnuKcRqX58FYNSxw6UMSt2up6GWRNozAxuochC
ph6xXQami7ajHvlVDwWP8V0rr/AScJKuqKyg/bdYUY+RoMj38CQGsQqjC4Pk5EwO
OR7ny70hrgpWjZWKxgTw+mZhEg4RkYaztteO+hOtbg4jc/78BEvWVMQo71bEGyVW
PZ7TPlG3xZqbF1HBxIaG33YPrZ0paA/TRqdy+nZ1Ny3kVfY572k=
=FGSs
-----END PGP SIGNATURE-----
--- End Message ---