mirror of
https://github.com/openwrt/packages.git
synced 2025-12-10 04:31:21 +00:00
tini: add patches for minimal cmake version "2.8.12...3.10"
This change adds backport patches from upstream to increase the minimal required cmake version from "2.8.0" to "2.8.12...3.10". Signed-off-by: Albrecht Lohofener <albrechtloh@gmx.de>
This commit is contained in:
committed by
Hannu Nyman
parent
2fab8e34c2
commit
d29215e6b8
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=tini
|
||||
PKG_VERSION:=0.19.0
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/krallin/tini/tar.gz/v${PKG_VERSION}?
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
From 41685c0ade9793a6ca51ad9f908f92ea5bbb49a9 Mon Sep 17 00:00:00 2001
|
||||
From: Bjorn Neergaard <bneergaard@mirantis.com>
|
||||
Date: Fri, 27 Jan 2023 08:07:51 -0700
|
||||
Subject: [PATCH 1/2] chore: bump minimum CMake to 2.8.12
|
||||
|
||||
This is both the last version supported by current CMake, and the
|
||||
version in use on Enterprise Linux 7.
|
||||
|
||||
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
|
||||
---
|
||||
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.0)
|
||||
+cmake_minimum_required (VERSION 2.8.12)
|
||||
project (tini C)
|
||||
|
||||
# Config
|
||||
@@ -0,0 +1,31 @@
|
||||
From 32e503365205cac479ad2110d72d18b2072fd93c Mon Sep 17 00:00:00 2001
|
||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 28 Mar 2025 19:10:02 +1100
|
||||
Subject: [PATCH 2/2] chore: allow CMake though to 3.10
|
||||
|
||||
This is allows the build with cmake-4.0.0 without deprecation warnings.
|
||||
|
||||
use min...max syntax to allow build with newer cmake.
|
||||
ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
|
||||
|
||||
Fixes:
|
||||
CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
|
||||
Compatibility with CMake < 3.5 has been removed from CMake.
|
||||
|
||||
Update the VERSION argument <min> value. Or, use the <min>...<max> syntax
|
||||
to tell CMake that the project requires at least <min> but has been updated
|
||||
to work with policies introduced by <max> or earlier.
|
||||
|
||||
Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
|
||||
---
|
||||
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 2.8.12...3.10)
|
||||
project (tini C)
|
||||
|
||||
# Config
|
||||
Reference in New Issue
Block a user