gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 12:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

libradiotap: backport upstream patch for CMake >= 4.0 support

Browse Source 
Backport upstream patch for libradiotap for CMake >= 4.0 support.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2025-11-25 15:58:52 +01:00
parent 126161a828
commit 7289b38933
2 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/libradiotap/patches/100-build-set-cmake_minimum_required-to-3.10.patch Normal file
View File

@@ -0,0 +1,21 @@
From 82bd3ead750016bbd874b11e5fedd6f376521882 Mon Sep 17 00:00:00 2001
From: Nick Hainke <vincent@systemli.org>
Date: Sun, 9 Nov 2025 16:48:57 +0100
Subject: [PATCH] build: set cmake_minimum_required to 3.10
New cmake versions require at least 3.5 as 'cmake_minimum_required'
in CMakeLists.txt. In future 3.10 will be required.
Signed-off-by: Nick Hainke <vincent@systemli.org>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
project(radiotap)
add_definitions("-D_BSD_SOURCE -D_DEFAULT_SOURCE -DRADIOTAP_SUPPORT_OVERRIDES")

42
libs/libradiotap/patches/101-CMakeLists-fix-compilation-with-Ninja-build-system.patch Normal file
View File

@@ -0,0 +1,42 @@
From 377905d798aec00358872de9896ce5c175336169 Mon Sep 17 00:00:00 2001
From: Christian Marangi <ansuelsmth@gmail.com>
Date: Sun, 23 Nov 2025 13:44:05 +0100
Subject: [PATCH] CMakeLists: fix compilation with Ninja build system
On using Ninja build system, the package currently don't configure
correctly with the error:
ninja: error: 'check/*', needed by 'CMakeFiles/radiotap_check', missing and no known rule to make it
This is caused by the usage of
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/check/*
that both CMake and Ninja doesn't expand to the list of all files in the
check directory.
To better address this, use the CMake GLOB to first enumerate all the
files in the check directory and then call DEPENDS on a variable
containing the list of files.
This restore correct functionality and better adapt to CMake syntax.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,10 @@ set_target_properties(parse PROPERTIES
target_link_libraries(parse radiotap)
+file(GLOB CHECK_FILES "${CMAKE_CURRENT_SOURCE_DIR}/check/*")
add_custom_target(radiotap_check ALL
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/check/check.sh ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/check/*
+ DEPENDS ${CHECK_FILES}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/check/
COMMENT "Check examples")
add_dependencies(radiotap_check parse)