diff options
| author | Holger Hoffstätte <holger@applied-asynchrony.com> | 2025-06-25 14:54:55 +0200 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-06-26 20:47:23 +0100 |
| commit | cf7e79a152bf94c77fb5bd517564686ecef4b7c0 (patch) | |
| tree | e93be4524063f02e6a053238e4b75cdfcd0488cd /dev-libs | |
| parent | a019cebf647f9e2a93a15132fe449829fbe13d09 (diff) | |
| download | gentoo-cf7e79a152bf94c77fb5bd517564686ecef4b7c0.tar.gz gentoo-cf7e79a152bf94c77fb5bd517564686ecef4b7c0.tar.bz2 gentoo-cf7e79a152bf94c77fb5bd517564686ecef4b7c0.zip | |
dev-libs/json-c: add patch for cmake4
Closes: https://bugs.gentoo.org/958972
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Part-of: https://github.com/gentoo/gentoo/pull/42736
Closes: https://github.com/gentoo/gentoo/pull/42736
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/json-c/files/0.18.0-cmake4.patch | 25 | ||||
| -rw-r--r-- | dev-libs/json-c/json-c-0.18.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/json-c/json-c-9999.ebuild | 2 |
3 files changed, 29 insertions, 0 deletions
diff --git a/dev-libs/json-c/files/0.18.0-cmake4.patch b/dev-libs/json-c/files/0.18.0-cmake4.patch new file mode 100644 index 000000000000..28aa10cf72dd --- /dev/null +++ b/dev-libs/json-c/files/0.18.0-cmake4.patch @@ -0,0 +1,25 @@ + +From: https://github.com/json-c/json-c/pull/888 +Bug: https://bugs.gentoo.org/958972 + +From 42864e12b0d7af01b1cf989d6da9e9a4477775a1 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Fri, 28 Mar 2025 23:14:48 +1100 +Subject: [PATCH] Allow build with cmake 4.0.0 + +Update the min version to match parent CMakeLists.txt 3.9...3.12 +--- + apps/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index f7c9dec633..ef2271d131 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -1,5 +1,5 @@ + +-cmake_minimum_required(VERSION 2.8) # see ../CMakeLists.txt for why 2.8 ++cmake_minimum_required(VERSION 3.9...3.12) + + if(POLICY CMP0075) + cmake_policy(SET CMP0075 NEW) diff --git a/dev-libs/json-c/json-c-0.18.ebuild b/dev-libs/json-c/json-c-0.18.ebuild index 997463b97256..2d6a867e1b6d 100644 --- a/dev-libs/json-c/json-c-0.18.ebuild +++ b/dev-libs/json-c/json-c-0.18.ebuild @@ -30,6 +30,8 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/json-c/config.h ) +PATCHES=( "${FILESDIR}/0.18.0-cmake4.patch" ) + multilib_src_configure() { # Tests use Valgrind automagically otherwise (bug #927027) export USE_VALGRIND=0 diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild index 95c54f504c3d..10b5af025f3c 100644 --- a/dev-libs/json-c/json-c-9999.ebuild +++ b/dev-libs/json-c/json-c-9999.ebuild @@ -30,6 +30,8 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/json-c/config.h ) +PATCHES=( "${FILESDIR}/0.18.0-cmake4.patch" ) + multilib_src_configure() { # Tests use Valgrind automagically otherwise (bug #927027) export USE_VALGRIND=0 |