From patchwork Mon Jun 30 10:41:01 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: 1724 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 76FABC7EE39 for ; Mon, 30 Jun 2025 10:41:49 +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.36449.1751280098428668587 for ; Mon, 30 Jun 2025 03:41:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=GCk0AMYo; spf=pass (domain: bmw.de, ip: 207.54.72.34, mailfrom: prvs=269d563bb=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=1751280098; x=1782816098; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=XWZe86ZV2t+iO8E0YZM3ReO++qjT4ijZoc3caIeUwg8=; b=GCk0AMYosyJaS0uD+yA/2jnE7PxoiHEhR18OiXMcBbySYegpsIi3OTJk 1cFpQamLkHzPPxhz7HuTuEoxNhSqiXyrTgSRgTWFqiq3nsCUl7f/BHsso PbgsbQCSggZLJH4h7WaGGNtrESeR9bkubL68g+tZg9S/rwC8QQcE8MkEA o=; X-CSE-ConnectionGUID: 8j2ecMERTkeBnzqZ5XCzUw== X-CSE-MsgGUID: jfqzgEoqTnKr3Utg9swhCA== Received: from 160.46.252.49.spf.bmwgroup.com (HELO esagw6.muc) ([160.46.252.49]) by esa12.hc324-48.eu.iphmx.com with ESMTP/TLS; 30 Jun 2025 12:41:36 +0200 Received: from esabb1.muc ([160.50.100.31]) by esagw6.muc with ESMTP/TLS; 30 Jun 2025 12:41:36 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb1.muc with ESMTP/TLS; 30 Jun 2025 12:41:35 +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; Mon, 30 Jun 2025 12:41:35 +0200 X-CSE-ConnectionGUID: lMtS7xPTRDeKKgF4b5bokQ== X-CSE-MsgGUID: WDwDUsRvT8OMBVUXJSqyHQ== X-CSE-ConnectionGUID: i/zBX0k+Sw+24IH/hT/kGw== X-CSE-MsgGUID: hHyhugYZTFqQ8zpNOUBe5w== From: Moritz Haase To: CC: Moritz Haase , , Subject: [PATCH v2 0/3] cmake: Major version bump to 4.0.3 Date: Mon, 30 Jun 2025 12:41:01 +0200 Message-ID: <20250630104104.4093207-1-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 MIME-Version: 1.0 X-ClientProxiedBy: smucmp15a.europe.bmw.corp (2a03:1e80:a15:58f::1:68) 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 ; Mon, 30 Jun 2025 10:41:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219503 This patch series bumps CMake to 4.0.3, the most current of the 4.x releases. That bump allows us to drop all of the upstreamable patches for CMake itself that we currently carry, which was the motivation for the update as suggested by Alex Kanavin in [0]. Following the preparatory merge of [1] and [2], there are only two components that require patches to build with the new CMake version. For both createrepo-c and libcomps, those patches have already been merged upstream, but there have been no subsequent releases yet. Thus, backports of the patches are included. They are to be merged changes in v2: - Re-ordered / squashed commits to keep bisectability (see [3], [4]) - Fixed patchtest findings [0]: https://lists.openembedded.org/g/openembedded-core/message/219113 [1]: https://git.openembedded.org/openembedded-core/commit/?id=c3efca7495889f3682225af8c9e01ceb094b1bb7 [2]: https://git.openembedded.org/openembedded-core/commit/?id=cb5234acdab200bd43b89416d8d7e9df91af58cc [3]: https://lists.openembedded.org/g/openembedded-core/message/219403 [4]: https://lists.openembedded.org/g/openembedded-core/message/219425 CC: alex.kanavin@gmail.com CC: quentin.schulz@cherry.de Moritz Haase (3): libcomps: Backport patch to support builds with CMake 4+ createrepo-c: Backport patches to support builds with CMake 4+ cmake: upgrade 3.31.6 -> 4.0.3 ...native_3.31.6.bb => cmake-native_4.0.3.bb} | 6 +- meta/recipes-devtools/cmake/cmake.inc | 8 +- ...mpilerABI-Strip-pipe-from-compile-fl.patch | 63 ----- ...xt2fs-ext2_fs.h-by-cmake-s-internal.patch} | 4 +- ...ng-undocumented-type-for-CURLOPT_NET.patch | 30 --- ...trary-characters-in-test-names-of-CT.patch | 202 ---------------- ...-CMakeLists.txt-disable-USE_NGHTTP2.patch} | 6 +- .../cmake/{cmake_3.31.6.bb => cmake_4.0.3.bb} | 1 - .../0001-Fix-libname-of-Libs.private.patch | 22 ++ ...ED_TARGET-for-3rd-party-dependencies.patch | 226 ++++++++++++++++++ ...-imported-targets-of-turned-off-depe.patch | 53 ++++ ...ds-without-Doxygen-being-present-wit.patch | 50 ++++ .../createrepo-c/createrepo-c_1.2.1.bb | 4 + ...libcomps-Support-builds-with-CMake-4.patch | 132 ++++++++++ .../libcomps/libcomps_0.1.21.bb | 1 + 15 files changed, 499 insertions(+), 309 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.31.6.bb => cmake-native_4.0.3.bb} (90%) delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch rename meta/recipes-devtools/cmake/cmake/{0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch => 0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch} (90%) delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch rename meta/recipes-devtools/cmake/cmake/{0001-CMakeLists.txt-disable-USE_NGHTTP2.patch => 0002-CMakeLists.txt-disable-USE_NGHTTP2.patch} (83%) rename meta/recipes-devtools/cmake/{cmake_3.31.6.bb => cmake_4.0.3.bb} (96%) create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-libname-of-Libs.private.patch create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0002-Use-IMPORTED_TARGET-for-3rd-party-dependencies.patch create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0003-Don-t-try-to-use-imported-targets-of-turned-off-depe.patch create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0004-cmake-Allow-builds-without-Doxygen-being-present-wit.patch create mode 100644 meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Support-builds-with-CMake-4.patch