From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Cc: Adolf Belka <adolf.belka@ipfire.org>
Subject: [PATCH 5/9] json-c: Update to CMakeLists.txt min cmake version
Date: Sun, 11 May 2025 12:13:00 +0200 [thread overview]
Message-ID: <20250511101311.7315-5-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20250511101311.7315-1-adolf.belka@ipfire.org>
- Patch has been created in the json-c source but not yet provided with a release
- Patch can be removed when nets version of json-c is released
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
lfs/json-c | 7 ++++---
.../json-c-0.18_allow_build_with_cmake_4.0.0.patch | 9 +++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch
diff --git a/lfs/json-c b/lfs/json-c
index edca5d3b2..2669e3825 100644
--- a/lfs/json-c
+++ b/lfs/json-c
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -73,10 +73,11 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch
cd $(DIR_APP) && mkdir -pv build
cd $(DIR_APP)/build && cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_STATIC_LIBS=OFF
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_STATIC_LIBS=OFF
cd $(DIR_APP)/build && make $(MAKETUNING)
cd $(DIR_APP)/build && make install
@rm -rf $(DIR_APP)
diff --git a/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch b/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch
new file mode 100644
index 000000000..faff25de5
--- /dev/null
+++ b/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch
@@ -0,0 +1,9 @@
+--- json-c-0.18/apps/CMakeLists.txt.orig 2024-09-15 18:15:01.000000000 +0200
++++ json-c-0.18/apps/CMakeLists.txt 2025-05-06 19:08:35.807635404 +0200
+@@ -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)
--
2.49.0
next prev parent reply other threads:[~2025-05-11 10:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-11 10:12 [PATCH 1/9] curl: Update to version 8.13.0 Adolf Belka
2025-05-11 10:12 ` [PATCH 2/9] cmake: Update to version 4.0.2 Adolf Belka
2025-05-11 10:12 ` [PATCH 3/9] cdrkit: Remove packge as it cannot be built with cmake-4.0.x Adolf Belka
2025-05-11 10:12 ` [PATCH 4/9] xorriso: Package to replace cdrkit Adolf Belka
2025-05-12 15:17 ` Michael Tremer
2025-05-12 16:07 ` Adolf Belka
2025-05-12 16:08 ` Michael Tremer
2025-05-12 16:39 ` Adolf Belka
2025-05-11 10:13 ` Adolf Belka [this message]
2025-05-11 10:13 ` [PATCH 6/9] libid3tag: Update CMakeLists.txt with min cmake version Adolf Belka
2025-05-11 10:13 ` [PATCH 7/9] libssh: Update to version 0.11.1 - fixes " Adolf Belka
2025-05-11 10:13 ` [PATCH 8/9] soxr: Update CMakeLists.txt with cmake min version Adolf Belka
2025-05-11 10:13 ` [PATCH 9/9] transmission: Update to CMakeLists.txt of min cmake version Adolf Belka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250511101311.7315-5-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox