mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
dev-libs/json-c: Sync with Gentoo
It's from Gentoo commit cf7e79a152bf94c77fb5bd517564686ecef4b7c0.
This commit is contained in:
parent
4801e4bcd4
commit
79091f7974
25
sdk_container/src/third_party/portage-stable/dev-libs/json-c/files/0.18.0-cmake4.patch
vendored
Normal file
25
sdk_container/src/third_party/portage-stable/dev-libs/json-c/files/0.18.0-cmake4.patch
vendored
Normal file
@ -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)
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user