summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch47
-rw-r--r--meta/recipes-devtools/apt/apt_2.6.1.bb1
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch b/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch
new file mode 100644
index 0000000000..c3a5ded494
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch
@@ -0,0 +1,47 @@
1From dc7a8b3050a2a43f49515a03ae19713dfced75dc Mon Sep 17 00:00:00 2001
2From: David Kalnischkies <david@kalnischkies.de>
3Date: Sat, 18 Nov 2023 13:10:05 +0000
4Subject: [PATCH] Raise cmake_minimum_required to 3.13 to avoid warnings
5
6CMake Deprecation Warning at CMakeLists.txt:6 (cmake_minimum_required):
7 Compatibility with CMake < 3.5 will be removed from a future version of
8 CMake.
9
10 Update the VERSION argument <min> value or use a ...<max> suffix to tell
11 CMake that the project does not need compatibility with older versions.
12
13Picking 3.13 here is a semi-random choice to avoid raising the requirement
14too much needlessly while also hopefully avoiding needing to raise it
15soon again based on the referenced mail.
16
17While we are at it, lets also fix the other spewed warning:
18
19CMake Warning (dev) at CMakeLists.txt:5 (project):
20 cmake_minimum_required() should be called prior to this top-level project()
21 call. Please see the cmake-commands(7) manual for usage documentation of
22 both commands.
23
24References: https://lists.debian.org/msgid-search/20230617162957.6pklb6632zf4nijc@mail.gaussglocke.de
25
26Upstream-Status: Backport [https://salsa.debian.org/apt-team/apt/-/commit/dc7a8b3050a2a43f49515a03ae19713dfced75dc]
27Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
28---
29 CMakeLists.txt | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/CMakeLists.txt b/CMakeLists.txt
33index 62182cddf..dae12e7c3 100644
34--- a/CMakeLists.txt
35+++ b/CMakeLists.txt
36@@ -2,8 +2,8 @@
37 # Licensed under the same terms as APT; i.e. GPL 2 or later.
38
39 # set minimum version
40+cmake_minimum_required(VERSION 3.13)
41 project(apt)
42-cmake_minimum_required(VERSION 3.4.0)
43 # Generic header locations
44 include_directories(${PROJECT_BINARY_DIR}/include)
45
46--
47GitLab
diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb
index d605d950dd..50ac2ea812 100644
--- a/meta/recipes-devtools/apt/apt_2.6.1.bb
+++ b/meta/recipes-devtools/apt/apt_2.6.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
14 file://0001-aptwebserver.cc-Include-array.patch \ 14 file://0001-aptwebserver.cc-Include-array.patch \
15 file://0001-Remove-using-std-binary_function.patch \ 15 file://0001-Remove-using-std-binary_function.patch \
16 file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \ 16 file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \
17 file://0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch \
17 " 18 "
18 19
19SRC_URI:append:class-native = " \ 20SRC_URI:append:class-native = " \