gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-16 14:29:05 -07:00
Code Issues Projects Releases Wiki Activity

net-analyzer/zmap: bump cmake_minimum_required and fix pkgconfig detection

Browse Source 
bump cmake_minimum_required

use find_package to check pkgconfig instead of find_program to avoid
failure without native-symlinks

Closes: https://bugs.gentoo.org/952027
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/41276
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Nicolas PARLANT
2025-03-25 10:27:50 +00:00
committed by Sam James
parent c251aa5ef5
commit e443855ba9
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net-analyzer/zmap/files/zmap-4.3.2-cmake.patch Normal file
View File

@@ -0,0 +1,12 @@
Compat with cmake-4
https://github.com/zmap/zmap/pull/933.patch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index baa524a..60e3839 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
project(ZMAP C)
set(ZMAP_VERSION DEVELOPMENT) # Change DEVELOPMENT to version number for release

18
net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch Normal file
View File

@@ -0,0 +1,18 @@
use find_package to prevent failure without native-symlinks
diff --git a/CMakeLists.txt b/CMakeLists.txt
index baa524a..60e3839 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,11 +85,7 @@ if (NOT FOUND_LIBUNISTRING)
message(FATAL_ERROR "Missing dependency: did not find libunistring, please install libunistring or equivalent. More details in INSTALL.md")
endif()
-find_program(FOUND_PKGCONFIG HINTS /usr/include/ NAMES pkg-config dev-util/pkgconf)
-if (NOT FOUND_PKGCONFIG)
- message(FATAL_ERROR "Missing dependency: did not find pkg-config, please install pkg-config or equivalent. More details in INSTALL.md")
-endif()
-
+find_package(PkgConfig REQUIRED)
if(ENABLE_DEVELOPMENT)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb")

6
net-analyzer/zmap/zmap-4.3.2.ebuild
View File

@@ -31,6 +31,12 @@ BDEPEND="
FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
PATCHES=(
"${FILESDIR}"/${PN}-4.3.2-pkgconfig.patch
# Merged. To be removed at next version.
"${FILESDIR}"/${PN}-4.3.2-cmake.patch
)
DOCS=( AUTHORS CHANGELOG.md README.md examples )
src_configure() {