summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGyorgy Sarvari <skandigraun@gmail.com>2025-06-05 07:16:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-06-09 17:43:41 +0100
commit8d1fa3d126da693d2a2adaf06a2535ab0376fd74 (patch)
treeffb0f789b4143cf52f9208e29fa60371ed9adcd8
parente71d2c0211272d3c3a84b73c82c4506858b7578b (diff)
downloadpoky-8d1fa3d126da693d2a2adaf06a2535ab0376fd74.tar.gz
diffoscope: upgrade 293 -> 297
Also, remove the musl restriction - it builds successfully with both glibc and musl. Changelog: 294: - Correct longstanding issue where many ">"-based version tests used in conditional fixtures were broken due to the lack of a __gt__ method. Thanks, Colin Watson! (Closes: #1102658) - Address a long-hidden issue in the test_versions testsuite where we weren't actually testing ">" as it was masked by the tests for equality in the testsuite. - Update copyright years. 295: - Use --walk over the potentially dangerous --scan argument of zipdetails(1). (Closes: reproducible-builds/diffoscope#406) 296: - Don't rely on zipdetails' --walk functionality to be available; only add that argument after testing for a new enough versions. (Closes: reproducible-builds/diffoscope#408) - Disable and then re-enable failing on stable-bpo. - Update copyright years. - Add NuGet package support. 297: - Add a LZMA comparator and tests. (From OE-Core rev: 7ba8b83d4d24ce81bba971f8ca274f95d11996ba) Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/diffoscope/diffoscope_297.bb (renamed from meta/recipes-support/diffoscope/diffoscope_293.bb)5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-support/diffoscope/diffoscope_293.bb b/meta/recipes-support/diffoscope/diffoscope_297.bb
index 59e7cbe000..6f6f4ac520 100644
--- a/meta/recipes-support/diffoscope/diffoscope_293.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_297.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
12 12
13inherit pypi setuptools3 13inherit pypi setuptools3
14 14
15SRC_URI[sha256sum] = "15315d09babdee45449be7042ad1f57104a5f04853bd6951cdc0da171c13ac3b" 15SRC_URI[sha256sum] = "25532061c640b4be7496f9a726640e20ca0fcb8e46a8a1a46e51ac940a5f4e57"
16 16
17RDEPENDS:${PN} += "\ 17RDEPENDS:${PN} += "\
18 binutils \ 18 binutils \
@@ -29,9 +29,6 @@ RDEPENDS:${PN} += "\
29 vim \ 29 vim \
30 " 30 "
31 31
32# Dependencies don't build for musl
33COMPATIBLE_HOST:libc-musl = 'null'
34
35do_install:append:class-native() { 32do_install:append:class-native() {
36 create_wrapper ${D}${bindir}/diffoscope \ 33 create_wrapper ${D}${bindir}/diffoscope \
37 MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ 34 MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \