commit: 131d3e2333308b293f3936c116ab3e51d6aed9e9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 25 23:04:21 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 25 23:05:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131d3e23
dev-libs/criterion: add 2.4.3 The -Wlto-type-mismatch issue has been fixed upstream but I can reproduce the test failure mentioned in bug #730120. Also, crank subproject versions to latest versions (even beyond what is in the subproj files). Bug: https://bugs.gentoo.org/730120 Bug: https://bugs.gentoo.org/964557 Closes: https://bugs.gentoo.org/855674 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/criterion/Manifest | 3 ++ dev-libs/criterion/criterion-2.4.3.ebuild | 76 +++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 36f8305ae0df..4064dcb7dcaa 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,4 +1,7 @@ DIST criterion-2.4.1.tar.gz 870842 BLAKE2B 8b7db80d5e943d4380072106eb32ffe95896e4e588986588fd8b0ebfe1078657e2a9231090355563fd8bd8588cacbaa5839e269a0a9c4e56b882789c97379f9b SHA512 22f1ae5152db93736282fac098ad510d497aa804589df8070fb6cf36a3063868f2a9ed3c5771bfde8a0352355d81178816870d68b83ca6d6582fd17cdd9332d9 +DIST criterion-2.4.3.tar.gz 875195 BLAKE2B 785d32651ab63faee6d4f089cb456ba4edc91b3e91f096c79409fcb45f8a6231c081f22f00f8996f4d23a5e7b35c9e9e21a309a15e7189df8c9fe4764aeb0684 SHA512 4699144627b6637a10b1602763f6220fdb52ea280cff9fe1f5eecbe941a828bae0a877d344bf9d661a0ec62bc5fcf51ebdfc843d6455af0a372a1e0b8a2c41b6 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb +DIST debugbreak-83bf7e933311b88613cbaadeced9c2e2c811054a.tar.gz 7064 BLAKE2B 93573499a23e302aa16c832a2731928e6ec97778bdbfc5632315be4a7ac0032de1327d868f858e2c89a418e7ac75e8e0cf0c371da158e1832eb5e416b1f20d5f SHA512 8432ce450713d9f05399ffd08ab1a44c9d088ea4d0b9cc477ec2454d335e03ffcdb50114daaceecbc4bbe3b151e934bcbd0e144fcdbfa0746474fb8fe615fd02 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbbdddd34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62 +DIST nanopb-cad3c18ef15a663e30e3e43e3a752b66378adec1.tar.gz 1186585 BLAKE2B 8fa8e2d35b50ec8cd160ecde00f2fc1c8d86e1e80944553330661fda64e3d6ba7d04e6f725aede51a849499827a1b77455d3b58a556fb7f63a431238a4d2f4ca SHA512 2b8aeee2fa3f31a74d4554629bb7f79fa4227b5f528b32d8e7db2b937cdbff9112ce5b74b8b427dee9510ae3d8d6516a267328f55b7a1a39377b79064f865fc9 diff --git a/dev-libs/criterion/criterion-2.4.3.ebuild b/dev-libs/criterion/criterion-2.4.3.ebuild new file mode 100644 index 000000000000..a03a9d03803b --- /dev/null +++ b/dev-libs/criterion/criterion-2.4.3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..14} ) + +inherit flag-o-matic meson python-any-r1 + +DEBUGBREAK_COMMIT="83bf7e933311b88613cbaadeced9c2e2c811054a" +KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" +NANOPB_COMMIT="cad3c18ef15a663e30e3e43e3a752b66378adec1" + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion"; +SRC_URI=" + https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/MrAnno/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz + https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz + https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz +" +S="${WORKDIR}/Criterion-${PV}" + +LICENSE="BSD-2 MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libgit2:= + dev-libs/libffi:= + dev-libs/nanomsg:= +" +DEPEND="${RDEPEND} + >=dev-libs/boxfort-0.1.4 + test? ( + $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') + ) +" +BDEPEND=" + dev-build/cmake + virtual/pkgconfig +" + +python_check_deps() { + python_has_version "dev-util/cram[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" subprojects/debugbreak || die + mv "${WORKDIR}/klib-${KLIB_COMMIT}" subprojects/klib || die + mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die + meson subprojects packagefiles --apply || die + + default +} + +src_configure() { + # Fails tests (bug #730120) + filter-lto + + # bug #906379 + use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE + + local emesonargs=( + -Dsamples=$(usex test true false) + -Dtests=$(usex test true false) + ) + + meson_src_configure +}
