diff options
| author | Moritz Haase <Moritz.Haase@bmw.de> | 2025-07-03 15:27:19 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-07 22:12:50 +0100 |
| commit | 3350021579e1ed92e1c9107e9e6b282786366cdf (patch) | |
| tree | a5cc60ddab23228b287445b01b75b5559b2a5ae5 | |
| parent | 49bebc51cfa1f005737dbcc65e5ed4059dd9ee4c (diff) | |
| download | poky-3350021579e1ed92e1c9107e9e6b282786366cdf.tar.gz | |
libwpe: Add patch to support builds with CMake 4+
PR [0] has been filed upstream, but isn't merged yet.
[0]: https://github.com/WebPlatformForEmbedded/libwpe/pull/136
(From OE-Core rev: e4349257cbd5d2ba91e2f7aa176513209867b465)
Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/libwpe_1.16.2.bb | 6 |
2 files changed, 42 insertions, 2 deletions
diff --git a/meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch b/meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch new file mode 100644 index 0000000000..05688ee463 --- /dev/null +++ b/meta/recipes-sato/webkit/libwpe/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From 7b227c7c1ac226498b1ea3987f87350d0f14f49f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Moritz Haase <Moritz.Haase@bmw.de> | ||
| 3 | Date: Wed, 2 Jul 2025 09:19:44 +0200 | ||
| 4 | Subject: [PATCH] cmake: Bump required CMake version to 3.5 to allow builds | ||
| 5 | with CMake 4+ | ||
| 6 | |||
| 7 | This enables builds with CMake 4+, fixing: | ||
| 8 | |||
| 9 | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
| 10 | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 11 | |||
| 12 | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 13 | to tell CMake that the project requires at least <min> but has been | ||
| 14 | updated to work with policies introduced by <max> or earlier. | ||
| 15 | |||
| 16 | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 17 | |||
| 18 | While at it, remove the extra call to 'cmake_policy()'. When passing the same | ||
| 19 | version as to 'cmake_minimum_required()' it's not needed, as the latter calls | ||
| 20 | the former automatically. | ||
| 21 | |||
| 22 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
| 23 | Upstream-Status: Submitted [https://github.com/WebPlatformForEmbedded/libwpe/pull/136] | ||
| 24 | --- | ||
| 25 | CMakeLists.txt | 3 +-- | ||
| 26 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
| 27 | |||
| 28 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 29 | index db9ae50..2a01daf 100644 | ||
| 30 | --- a/CMakeLists.txt | ||
| 31 | +++ b/CMakeLists.txt | ||
| 32 | @@ -1,5 +1,4 @@ | ||
| 33 | -cmake_minimum_required(VERSION 3.0) | ||
| 34 | -cmake_policy(VERSION 3.0) | ||
| 35 | +cmake_minimum_required(VERSION 3.5) | ||
| 36 | |||
| 37 | set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") | ||
| 38 | include(VersioningUtils) | ||
diff --git a/meta/recipes-sato/webkit/libwpe_1.16.2.bb b/meta/recipes-sato/webkit/libwpe_1.16.2.bb index 324e2f213c..6cb6818acc 100644 --- a/meta/recipes-sato/webkit/libwpe_1.16.2.bb +++ b/meta/recipes-sato/webkit/libwpe_1.16.2.bb | |||
| @@ -10,9 +10,11 @@ inherit cmake features_check pkgconfig | |||
| 10 | 10 | ||
| 11 | REQUIRED_DISTRO_FEATURES = "opengl" | 11 | REQUIRED_DISTRO_FEATURES = "opengl" |
| 12 | 12 | ||
| 13 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" | 13 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz \ |
| 14 | file://0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch \ | ||
| 15 | " | ||
| 14 | SRC_URI[sha256sum] = "960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7" | 16 | SRC_URI[sha256sum] = "960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7" |
| 15 | 17 | ||
| 16 | # This is a tweak of upstream-version-is-even needed because | 18 | # This is a tweak of upstream-version-is-even needed because |
| 17 | # ipstream directory contains tarballs for other components as well. | 19 | # upstream directory contains tarballs for other components as well. |
| 18 | UPSTREAM_CHECK_REGEX = "libwpe-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" | 20 | UPSTREAM_CHECK_REGEX = "libwpe-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar" |
