summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Haase <Moritz.Haase@bmw.de>2025-07-03 15:27:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-07-07 22:12:50 +0100
commit49bebc51cfa1f005737dbcc65e5ed4059dd9ee4c (patch)
tree51e790378dc2dc9fe639e739926be93bb81114a3
parentc20a75dd5b41ab2b853c0b61617580db559fb23c (diff)
downloadpoky-49bebc51cfa1f005737dbcc65e5ed4059dd9ee4c.tar.gz
musl-locales: Add patch to support builds with CMake 4+
PR [0] has been filed upstream, but isn't merged yet. [0]: https://git.adelielinux.org/adelie/musl-locales/-/merge_requests/10 (From OE-Core rev: ab7c39ac6d3145b8f711282ebd2c6da5ebfb3de1) Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/musl/musl-locales/0001-cmake-Support-builds-with-CMake-4.patch46
-rw-r--r--meta/recipes-core/musl/musl-locales_git.bb4
2 files changed, 49 insertions, 1 deletions
diff --git a/meta/recipes-core/musl/musl-locales/0001-cmake-Support-builds-with-CMake-4.patch b/meta/recipes-core/musl/musl-locales/0001-cmake-Support-builds-with-CMake-4.patch
new file mode 100644
index 0000000000..d4d36eb522
--- /dev/null
+++ b/meta/recipes-core/musl/musl-locales/0001-cmake-Support-builds-with-CMake-4.patch
@@ -0,0 +1,46 @@
1From 89a314b03d0b2e600bb503a1e3d75faa655d65e0 Mon Sep 17 00:00:00 2001
2From: Moritz Haase <Moritz.Haase@bmw.de>
3Date: Wed, 2 Jul 2025 08:37:21 +0200
4Subject: [PATCH] cmake: Support builds with CMake 4+
5
6CMake 4 has removed support for compatibility with CMake < 3.5 and thus builds
7fail with:
8
9 CMake Error at CMakeLists.txt:2 (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
18To ensure builds with older CMake versions are still possible, use the suggested
19'<min>...<max>' syntax instead of simply bumping '<min>'. To avoid a deprecation
20warning by CMake 3.31+, 3.10 was chosen as '<max>' instead of 3.5.
21
22While at it, move the 'cmake_minimum_required()' call before 'project()' to fix:
23
24 CMake Warning (dev) at CMakeLists.txt:2 (project):
25
26 cmake_minimum_required() should be called prior to this top-level
27 project() call. Please see the cmake-commands(7) manual for usage
28 documentation of both commands.
29
30Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
31Upstream-Status: Submitted [https://git.adelielinux.org/adelie/musl-locales/-/merge_requests/10]
32---
33 CMakeLists.txt | 2 +-
34 1 file changed, 1 insertion(+), 1 deletion(-)
35
36diff --git a/CMakeLists.txt b/CMakeLists.txt
37index c8ac5c4..5744761 100644
38--- a/CMakeLists.txt
39+++ b/CMakeLists.txt
40@@ -1,5 +1,5 @@
41+cmake_minimum_required(VERSION 2.8...3.10)
42 project(locales C)
43-cmake_minimum_required(VERSION 2.8)
44
45 option(LOCALE_PROFILE "Install profile file setting the MUSL_LOCPATH environment variable" ON)
46
diff --git a/meta/recipes-core/musl/musl-locales_git.bb b/meta/recipes-core/musl/musl-locales_git.bb
index c8510596cf..3573a32062 100644
--- a/meta/recipes-core/musl/musl-locales_git.bb
+++ b/meta/recipes-core/musl/musl-locales_git.bb
@@ -7,7 +7,9 @@ LICENSE = "MIT & LGPL-3.0-or-later"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=cf5713fba707073020b1db2acaa73e78 \ 7LIC_FILES_CHKSUM = "file://LICENSE;md5=cf5713fba707073020b1db2acaa73e78 \
8 file://LICENSE.MIT;md5=a4f1c6864a83ddf4b754cdab7d593523" 8 file://LICENSE.MIT;md5=a4f1c6864a83ddf4b754cdab7d593523"
9 9
10SRC_URI = "git://git.adelielinux.org/adelie/musl-locales;protocol=https;branch=main" 10SRC_URI = "git://git.adelielinux.org/adelie/musl-locales;protocol=https;branch=main \
11 file://0001-cmake-Support-builds-with-CMake-4.patch \
12 "
11 13
12PV = "1.0+git" 14PV = "1.0+git"
13SRCREV = "5663f5bfd30bf9e1e0ba3fc5fe2da6725969f30e" 15SRCREV = "5663f5bfd30bf9e1e0ba3fc5fe2da6725969f30e"