From patchwork Sun May 11 10:13:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8722 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZwJV96LMSz3x4T for ; Sun, 11 May 2025 10:13:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZwJV94V92z6RX for ; Sun, 11 May 2025 10:13:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZwJTz1LKZz37BH for ; Sun, 11 May 2025 10:13:27 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZwJTw1cnSz33pm for ; Sun, 11 May 2025 10:13:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4ZwJTv09b4z6QD; Sun, 11 May 2025 10:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746958403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=46CBhXVK4xpvcx7h2A3vwPGu7OH1lDdgEHaV6ibXkZg=; b=eGIQSpa0kyYoTwvnZR6+zt5EUD99ctojfZQ1kodtJI8gazHMwmwd4+qebK/1HImiI7iaer zpFkbk201m4rJ1U5epNghAo/Tofec7N06JMhLR4wtFQlDd1h3vggi57CWPRtmkfgqGGujb YTaX8i5PSWK/B8MjvoPHQkqJZPnRiDbL8r/1oJYuM6cGU32QK4gavHaLjZax9LfUy9td3I SmIGJvnHSRlHCw2d/6FePTvUtZ5OiLYLTrTeJYgIyWhnbkzh/VXSTkQIsugHnqL1dHxlbD A5oIx3o1uDIWSkHEsHkqyjh92h78cg3/eyChW90j4CjGaEzX53PDJopMCPxtOg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746958403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=46CBhXVK4xpvcx7h2A3vwPGu7OH1lDdgEHaV6ibXkZg=; b=lwgU1yEO2F3hyBPQ8NRKukN8cT/KHwWM9DygUGGr6tbOTdC5KCT08p49IZuAjebIHkkV9k smKRHoGAkbQEvFBQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 5/9] json-c: Update to CMakeLists.txt min cmake version Date: Sun, 11 May 2025 12:13:00 +0200 Message-ID: <20250511101311.7315-5-adolf.belka@ipfire.org> In-Reply-To: <20250511101311.7315-1-adolf.belka@ipfire.org> References: <20250511101311.7315-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - 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 --- 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 # +# Copyright (C) 2007-2025 IPFire Team # # # # 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)