commit: 80705da7bf59283c53583fd74f4d2ac28c0239ea Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 27 15:35:59 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 27 19:46:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80705da7
dev-libs/criterion: Fix build w/ cmake-4 in bundled lib Closes: https://bugs.gentoo.org/957504 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/criterion/criterion-2.4.1-r1.ebuild | 24 ++++++++++++++-------- .../criterion/files/criterion-2.4.1-cmake4.patch | 18 ++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dev-libs/criterion/criterion-2.4.1-r1.ebuild b/dev-libs/criterion/criterion-2.4.1-r1.ebuild index 95418b86a7b8..9ba352ec799b 100644 --- a/dev-libs/criterion/criterion-2.4.1-r1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,19 +25,25 @@ KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/nanomsg:= +RDEPEND=" dev-libs/libgit2:= - dev-libs/libffi:=" + 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" + ) +" +BDEPEND=" + dev-build/cmake + virtual/pkgconfig +" PATCHES=( - "${FILESDIR}"/${PN}-2.4.1-includes.patch + "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-cmake4.patch # bug 957504 ) python_check_deps() { @@ -49,12 +55,12 @@ pkg_setup() { } src_prepare() { - default - rm -r dependencies/{debugbreak,klib} || die mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die + + default } src_configure() { diff --git a/dev-libs/criterion/files/criterion-2.4.1-cmake4.patch b/dev-libs/criterion/files/criterion-2.4.1-cmake4.patch new file mode 100644 index 000000000000..edd08523237d --- /dev/null +++ b/dev-libs/criterion/files/criterion-2.4.1-cmake4.patch @@ -0,0 +1,18 @@ +Combines: +https://github.com/nanopb/nanopb/commit/37bea38a137dda4d90433fe91ac88b671035a5e1 +https://github.com/nanopb/nanopb/commit/0c3bb686654c0629834fd4cf0d4bf58eea30bfcc + +--- a/subprojects/nanopb/CMakeLists.txt ++++ b/subprojects/nanopb/CMakeLists.txt +@@ -1,8 +1,8 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.14.0) + +-project(nanopb C) ++project(nanopb VERSION 0.4.5 LANGUAGES C) + +-set(nanopb_VERSION_STRING nanopb-0.4.5) ++set(nanopb_VERSION_STRING ${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}-dev) + set(nanopb_SOVERSION 0) + + string(REPLACE "nanopb-" "" nanopb_VERSION ${nanopb_VERSION_STRING})
