gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-22 04:19:06 -07:00
Code Issues Projects Releases Wiki Activity

dev-debug/sysdig: fixups for 0.40.1

Browse Source 
- do not check kernel config for binpkg
- fix cmake4 QA warning

Closes: https://bugs.gentoo.org/964649
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1118
Merges: https://codeberg.org/gentoo/gentoo/pulls/1118
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Holger Hoffstätte
2026-06-09 17:21:25 +02:00
committed by Joonas Niilola
parent b503590759
commit 9f1d7deebd
2 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
dev-debug/sysdig/files/0.40.1-cmake4.patch Normal file
View File

@@ -0,0 +1,68 @@
From https://github.com/draios/sysdig/pull/2167
From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
Date: Sun, 19 Oct 2025 12:56:26 +0200
Subject: [PATCH] fix(build): bump cmake_minimum_required to 3.12 everywhere
This brings the required CMake version in line with falcosecurity/libs.
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
---
CMakeLists.txt | 2 +-
CMakeListsGtestInclude.cmake | 2 +-
cmake/modules/driver-repo/CMakeLists.txt | 2 +-
cmake/modules/falcosecurity-libs-repo/CMakeLists.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1cbd02ccd..97957b0835 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt)
"The following wiki page has more information on manually building sysdig: http://bit.ly/1oJ84UI")
endif()
-cmake_minimum_required(VERSION 3.5.1)
+cmake_minimum_required(VERSION 3.12)
project(sysdig)
diff --git a/CMakeListsGtestInclude.cmake b/CMakeListsGtestInclude.cmake
index 76c0f1b1ca..375e8efba0 100644
--- a/CMakeListsGtestInclude.cmake
+++ b/CMakeListsGtestInclude.cmake
@@ -16,7 +16,7 @@
# limitations under the License.
#
-cmake_minimum_required(VERSION 2.8.2)
+cmake_minimum_required(VERSION 3.12)
project(googletest-download NONE)
diff --git a/cmake/modules/driver-repo/CMakeLists.txt b/cmake/modules/driver-repo/CMakeLists.txt
index 6f8684b574..5c1939ce15 100644
--- a/cmake/modules/driver-repo/CMakeLists.txt
+++ b/cmake/modules/driver-repo/CMakeLists.txt
@@ -16,7 +16,7 @@
# limitations under the License.
#
-cmake_minimum_required(VERSION 3.5.1)
+cmake_minimum_required(VERSION 3.12)
project(driver-repo NONE)
diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
index 946cf5d260..5131a07ce2 100644
--- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
+++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
@@ -16,7 +16,7 @@
# limitations under the License.
#
-cmake_minimum_required(VERSION 3.5.1)
+cmake_minimum_required(VERSION 3.12)
project(falcosecurity-libs-repo NONE)

5
dev-debug/sysdig/sysdig-0.40.1-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -58,10 +58,11 @@ PDEPEND="modules? ( =dev-debug/scap-driver-${LIBS_VERSION}* )"
PATCHES=(
"${FILESDIR}/0.38.1-scap-loader.patch"
"${FILESDIR}/0.40.1-cmake4.patch"
)
pkg_pretend() {
if use bpf; then
if use bpf && [[ ${MERGE_TYPE} != binary ]] ; then
local CONFIG_CHECK="
~BPF
~BPF_EVENTS