From patchwork Thu Jul 3 13:27:13 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: 1733 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 7CB2BC77B7C for ; Thu, 3 Jul 2025 13:27:46 +0000 (UTC) Received: from esa10.hc324-48.eu.iphmx.com (esa10.hc324-48.eu.iphmx.com [207.54.69.29]) by mx.groups.io with SMTP id smtpd.web10.22644.1751549263720874398 for ; Thu, 03 Jul 2025 06:27:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bmw.de header.s=mailing1 header.b=ddNnd+N6; spf=pass (domain: bmw.de, ip: 207.54.69.29, 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=1751549263; x=1783085263; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=XfQVcrhPWvQqPIJNkds5RZVVn8SAPe4jaFw1reLxAGc=; b=ddNnd+N6mKgswQ5tmhlA9u28hijMy3v9xb3KhTv47NCmHlvsGxCL08D4 8EwS59I5lLpRBMAjOtVcm9nhAeEnNfrY7q5DfBA5SAdBD1z9NoOHyZtaH SCicy1xGTAEMr1DAauSBFVKc4r4nrU7onO56R2n9ARzODo0t0xk7ZY1JQ w=; X-CSE-ConnectionGUID: 8bXMzyZwQhOnlihBOLpUPQ== X-CSE-MsgGUID: OHPgbLliSOqSOwKwhaa9Sw== Received: from 160.46.252.49.spf.bmwgroup.com (HELO esagw6.muc) ([160.46.252.49]) by esa10.hc324-48.eu.iphmx.com with ESMTP/TLS; 03 Jul 2025 15:27:42 +0200 Received: from unknown (HELO esabb2.muc) ([10.31.187.133]) by esagw6.muc with ESMTP/TLS; 03 Jul 2025 15:27:42 +0200 Received: from smucmp12a.bmwgroup.net (HELO smucmp12a.europe.bmw.corp) ([10.30.13.95]) by esabb2.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:41 +0200 X-CSE-ConnectionGUID: vUg+kVNLQzKrFVs7LU/RgA== X-CSE-MsgGUID: NPnXQWyKS8mas8i+PndyBw== X-CSE-ConnectionGUID: NMg5hMUNQaCnmeFHS+YzbQ== X-CSE-MsgGUID: ZvAq54fHT2ebOITZiJ1bjw== From: Moritz Haase To: CC: Moritz Haase , , , , Subject: [PATCH v5 0/7] cmake: Major version bump to 4.0.3 Date: Thu, 3 Jul 2025 15:27:13 +0200 Message-ID: <20250703132720.3378569-1-Moritz.Haase@bmw.de> X-Mailer: git-send-email 2.50.0 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:27:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219881 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]. A number of components require (minor) patches to build with the new CMake version. In most cases, those are backports of commits that haven't made it into an upstream release yet. The bump depends on this patches, but not vice-versa (since we are already on CMake 3.31). Thus, if desired, it would be possible to pull the 'Allow builds with CMake 4+' patches in in advance of the actual bump. changes in v5: - Fix for oe_selftest failure in 'DevtoolAddTests.test_devtool_add_library' - Updated patch for musl-locales based on upstream feedback changes in v4: - Fixed broken patch formatting. changes in v3: - Updated patch series description. - Added four additional commits with patches for build failures seen on Autobuilder. Those should be all be fixed now, apart from the one in meta-virt (yajl-2.1.0), which I don't have set up locally. - Fix for test failure seen in SDK tests. 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 CC: antonin.godard@bootlin.com CC: Peter.Marko@siemens.com Moritz Haase (7): libcomps: Backport patch to support builds with CMake 4+ createrepo-c: Backport patches to support builds with CMake 4+ apt: Backport patch to support builds with CMake 4+ libubootenv: Backport patch to support builds with CMake 4+ musl-locales: Add patch to support builds with CMake 4+ libwpe: Add patch to support builds with CMake 4+ cmake: upgrade 3.31.6 -> 4.0.3 .../sdkext/files/myapp_cmake/CMakeLists.txt | 2 +- meta/lib/oeqa/selftest/cases/devtool.py | 10 +- ...Update-cmake_minimum_required-to-3.5.patch | 50 ++++ meta/recipes-bsp/u-boot/libubootenv_0.3.6.bb | 4 +- ...red-CMake-version-to-3.5-to-allow-bu.patch | 41 ++++ meta/recipes-core/musl/musl-locales_git.bb | 4 +- ...mum_required-to-3.13-to-avoid-warnin.patch | 47 ++++ meta/recipes-devtools/apt/apt_2.6.1.bb | 1 + ...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 + ...red-CMake-version-to-3.5-to-allow-bu.patch | 38 +++ meta/recipes-sato/webkit/libwpe_1.16.2.bb | 6 +- 25 files changed, 695 insertions(+), 316 deletions(-) create mode 100644 meta/recipes-bsp/u-boot/libubootenv/0001-Update-cmake_minimum_required-to-3.5.patch create mode 100644 meta/recipes-core/musl/musl-locales/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch create mode 100644 meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch 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 create mode 100644 meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch