From patchwork Thu Jul 3 13:27:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Haase Moritz, JD-62" X-Patchwork-Id: 66196 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61BFEC83F07 for ; Thu, 3 Jul 2025 13:28:26 +0000 (UTC) Received: from esa12.hc324-48.eu.iphmx.com (esa12.hc324-48.eu.iphmx.com [207.54.72.34]) by mx.groups.io with SMTP id smtpd.web11.22526.1751549297623019367 for ; Thu, 03 Jul 2025 06:28:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=aGlZ1Dbk; spf=pass (domain: bmw.de, ip: 207.54.72.34, mailfrom: prvs=2724bd385=moritz.haase@bmw.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bmw.de; i=@bmw.de; q=dns/txt; s=mailing1; t=1751549298; x=1783085298; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PpBbZDYOwXlIk/OHcTJctil2T5kZn6Pri3kLUKGIEpA=; b=aGlZ1DbkUDOWAMih/sHr2V4tmiodrP/xRgvXM/4NlhkOjmNko6SIsb7Y L4P0OA85AaMNcWhutUFx/PRVYBJcpzS0xPxrBTP8MPrkdfK1ynWKMmJKR QmMO49bzeV/dGdpwPSAbA2rgDySoAXOMYyu7SHQb8w318nPcX8p4IxOrA I=; X-CSE-ConnectionGUID: QCn0MXIJRW6ECqRtcF42QA== X-CSE-MsgGUID: GVUMaQ1IRg2vqxUwh7YmCQ== Received: from esagw1.bmwgroup.com (HELO esagw1.muc) ([160.46.252.34]) by esa12.hc324-48.eu.iphmx.com with ESMTP/TLS; 03 Jul 2025 15:28:16 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw1.muc with ESMTP/TLS; 03 Jul 2025 15:28:16 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 03 Jul 2025 15:27:42 +0200 Received: from q1054628.de-cci.bmwgroup.net (10.30.85.209) by smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) with Microsoft SMTP Server (version=TLS; Thu, 3 Jul 2025 15:27:42 +0200 X-CSE-ConnectionGUID: du4vH3nLTjCRFn6odCD8Zg== X-CSE-MsgGUID: 0H7mI+zRSP6l6P51nPHy9g== X-CSE-ConnectionGUID: N0njMoSBReSDPsy38unZyg== X-CSE-MsgGUID: gUyvKgzcQmSS5b9pqWeAcQ== From: Moritz Haase To: CC: Moritz Haase Subject: [PATCH v5 3/7] apt: Backport patch to support builds with CMake 4+ Date: Thu, 3 Jul 2025 15:27:16 +0200 Message-ID: <20250703132720.3378569-4-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250703132720.3378569-1-Moritz.Haase@bmw.de> References: <20250703132720.3378569-1-Moritz.Haase@bmw.de> MIME-Version: 1.0 X-ClientProxiedBy: smucmp09a.europe.bmw.corp (2a03:1e80:a15:58f::2029) To smucmp12a.europe.bmw.corp (2a03:1e80:a15:58f::1:9) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 03 Jul 2025 13:28:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219886 There have been a number of upstream releases that ship this patch already, but given that the most recent ones are considered experimental, I opted to backport instead. Signed-off-by: Moritz Haase --- changes in v5: - None changes in v4: - Fix patch formatting changes in v3: - Commit added to series --- ...mum_required-to-3.13-to-avoid-warnin.patch | 47 +++++++++++++++++++ meta/recipes-devtools/apt/apt_2.6.1.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch diff --git a/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch b/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch new file mode 100644 index 0000000000..c3a5ded494 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch @@ -0,0 +1,47 @@ +From dc7a8b3050a2a43f49515a03ae19713dfced75dc Mon Sep 17 00:00:00 2001 +From: David Kalnischkies +Date: Sat, 18 Nov 2023 13:10:05 +0000 +Subject: [PATCH] Raise cmake_minimum_required to 3.13 to avoid warnings + +CMake Deprecation Warning at CMakeLists.txt:6 (cmake_minimum_required): + Compatibility with CMake < 3.5 will be removed from a future version of + CMake. + + Update the VERSION argument value or use a ... suffix to tell + CMake that the project does not need compatibility with older versions. + +Picking 3.13 here is a semi-random choice to avoid raising the requirement +too much needlessly while also hopefully avoiding needing to raise it +soon again based on the referenced mail. + +While we are at it, lets also fix the other spewed warning: + +CMake Warning (dev) at CMakeLists.txt:5 (project): + cmake_minimum_required() should be called prior to this top-level project() + call. Please see the cmake-commands(7) manual for usage documentation of + both commands. + +References: https://lists.debian.org/msgid-search/20230617162957.6pklb6632zf4nijc@mail.gaussglocke.de + +Upstream-Status: Backport [https://salsa.debian.org/apt-team/apt/-/commit/dc7a8b3050a2a43f49515a03ae19713dfced75dc] +Signed-off-by: Moritz Haase +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62182cddf..dae12e7c3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,8 +2,8 @@ + # Licensed under the same terms as APT; i.e. GPL 2 or later. + + # set minimum version ++cmake_minimum_required(VERSION 3.13) + project(apt) +-cmake_minimum_required(VERSION 3.4.0) + # Generic header locations + include_directories(${PROJECT_BINARY_DIR}/include) + +-- +GitLab diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index d605d950dd..50ac2ea812 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb @@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-aptwebserver.cc-Include-array.patch \ file://0001-Remove-using-std-binary_function.patch \ file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \ + file://0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch \ " SRC_URI:append:class-native = " \