jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

encfs: allow build with cmake-4.0.0

Browse Source 
patch for vendor includes from https://github.com/abumq/easyloggingpp 863
This commit is contained in:
Rudi Heitbaum 2025-03-28 12:41:57 +00:00
parent fd583318fe
commit c1422936d5
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/addons/addon-depends/system-tools-depends/encfs/package.mk
View File

@ -14,4 +14,5 @@ PKG_BUILD_FLAGS="-sysroot"
PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=${SYSROOT_PREFIX}/usr/include \
-DBUILD_UNIT_TESTS=OFF \
-DCMAKE_SKIP_RPATH=ON"
-DCMAKE_SKIP_RPATH=ON \
-DUSE_INTERNAL_TINYXML=OFF"

25
packages/addons/addon-depends/system-tools-depends/encfs/patches/encfs-677-build-with-cmake-4.0.0.patch Normal file
View File

@ -0,0 +1,25 @@
From 40253d13dbeb8ad09547f29dc7a4d7fe0acfa7a5 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 28 Mar 2025 23:40:09 +1100
Subject: [PATCH] Allow build with cmake 4.0.0
use min...max syntax to allow build with newer cmake.
ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f9d0f05..b04c8846 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
# 3.0.2 preferred, but we can often get by with 2.8.
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8...3.10)
if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} LESS 3.0.2)
message(WARNING "You should use cmake 3.0.2 or newer for configuration to run correctly.")
endif()

27
packages/addons/addon-depends/system-tools-depends/encfs/patches/encfs-863-build-with-cmake-4.0.0.patch Normal file
View File

@ -0,0 +1,27 @@
From 7a4014b1e239fc34ef130487620545f1e8e69299 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 5 Mar 2025 18:05:23 -0500
Subject: [PATCH] Update minimum CMake version to 3.12; support CMake 4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
CMake 4.0 drops support for CMake <3.5, so minimum versions need to be
adjusted for forward compatibility. As long as we are touching the
minimum version, let’s advance to 3.12, which can be considered the
oldest “modern” CMake release, and which is available in all known
supported Linux distributions today.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt b/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
index 538cc8a0b..265b0b380 100644
--- a/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
+++ b/vendor/github.com/muflihun/easyloggingpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.12)
project(Easyloggingpp CXX)