| Message ID | 20250120210307.1876707-1-tgamblin@baylibre.com |
|---|---|
| State | Accepted, archived |
| Commit | 729611f8284a4b408b8c65a6407daf667571c415 |
| Headers | show |
| Series | cmake: upgrade 3.31.3 -> 3.31.4 | expand |
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.31.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.31.4.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.31.3.bb rename to meta/recipes-devtools/cmake/cmake-native_3.31.4.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 14cd9ffc5ee..f1410a2c4be 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -20,7 +20,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \ " -SRC_URI[sha256sum] = "fac45bc6d410b49b3113ab866074888d6c9e9dc81a141874446eb239ac38cb87" +SRC_URI[sha256sum] = "a6130bfe75f5ba5c73e672e34359f7c0a1931521957e8393a5c2922c8b0f7f25" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch index 68c1020a42f..cf00964a9c4 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch @@ -1,4 +1,4 @@ -From d6e3cb98ffa81c6234ad5a563354ef5f442e1bb3 Mon Sep 17 00:00:00 2001 +From 969b2d07ad955fdc117bf2ea30305a5b2e74ea76 Mon Sep 17 00:00:00 2001 From: Philip Lorenz <philip.lorenz@bmw.de> Date: Mon, 3 Jun 2024 13:19:24 +0200 Subject: [PATCH] CMakeDetermineCompilerABI: Strip -pipe from compile flags diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch index fe3bf33c607..a01e3fe8c7f 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch @@ -1,4 +1,4 @@ -From 3f9b36a52f12e8f8860cf4337acc9a9514a2095b Mon Sep 17 00:00:00 2001 +From 8faeaefaf00f8d443511077b82624a8bd19cf725 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Wed, 28 Dec 2022 17:51:27 +0800 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 diff --git a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch index ea4c76f99f2..95ae9108aaa 100644 --- a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +++ b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch @@ -1,4 +1,4 @@ -From 7a4c1ed7b4dd038ef99c4a82e1d27743b2801757 Mon Sep 17 00:00:00 2001 +From c0ca5859788189a81c53face2ab5eaeadc1236b4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <otavio@ossystems.com.br> Date: Thu, 5 Jul 2018 10:28:04 -0300 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal diff --git a/meta/recipes-devtools/cmake/cmake_3.31.3.bb b/meta/recipes-devtools/cmake/cmake_3.31.4.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.31.3.bb rename to meta/recipes-devtools/cmake/cmake_3.31.4.bb
Release notes: https://cmake.org/cmake/help/latest/release/3.31.html#id17 commit log: |tgamblin@megalith ~/workspace/git/cmake (master)$ git log --oneline v3.31.3..v3.31.4 |569b821a13 (tag: v3.31.4) CMake 3.31.4 |92b260387d Merge topic 'duplicate-source-behavior' into release-3.31 |3df8890638 Merge topic 'lfortran-generate-object-code' into release-3.31 |8f45140baf Merge topic 'revert-genex-tco-subgraph' into release-3.31 |3e15419bd4 target_sources: Restore toleration of duplicate CXX_MODULES sources |5cfb8ae790 Tests/CXXModules: add a test with duplicate sources |daf6cc89ee LFortran: Remove hard-coded --generate-object-code flag |a6b84a438f GenEx: Revert "Limit TARGET_PROPERTY transitive closure optimization" |627d710570 Merge topic 'FindBoost-1.87' into release-3.31 |d29855f985 Merge topic 'codegen-help' into release-3.31 |f485f94d1a FindBoost: Add support for Boost 1.87 |45726d93a8 Makefile: List codegen target in help |e7153c29ac Merge topic 'Help-FindPython-Fix-typo' into release-3.31 |e7ea2998fb Help: FindPython: fix typo Reproducibility OK: |2025-01-20 13:52:30,296 - oe-selftest - INFO - Ran 1 test in 1949.827s |2025-01-20 13:52:30,296 - oe-selftest - INFO - OK |2025-01-20 13:52:34,885 - oe-selftest - INFO - RESULTS: |2025-01-20 13:52:34,886 - oe-selftest - INFO - RESULTS - reproducible.ReproducibleTests.test_reproducible_builds: PASSED (1874.21s) |2025-01-20 13:52:34,886 - oe-selftest - INFO - SUMMARY: |2025-01-20 13:52:34,886 - oe-selftest - INFO - oe-selftest () - Ran 1 test in 1949.827s |2025-01-20 13:52:34,886 - oe-selftest - INFO - oe-selftest - OK - All required tests passed (successes=1, skipped=0, failures=0, errors=0) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> --- .../cmake/{cmake-native_3.31.3.bb => cmake-native_3.31.4.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- ...1-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch | 2 +- .../cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 2 +- ...5-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | 2 +- .../recipes-devtools/cmake/{cmake_3.31.3.bb => cmake_3.31.4.bb} | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.31.3.bb => cmake-native_3.31.4.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.31.3.bb => cmake_3.31.4.bb} (100%)