commit: e443855ba9b97bbbc647fb9e251e9ca9dcbf5f89 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Tue Mar 25 10:27:50 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 28 17:23:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e443855b
net-analyzer/zmap: bump cmake_minimum_required and fix pkgconfig detection 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 <AT> parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/41276 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/zmap/files/zmap-4.3.2-cmake.patch | 12 ++++++++++++ net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch | 18 ++++++++++++++++++ net-analyzer/zmap/zmap-4.3.2.ebuild | 6 ++++++ 3 files changed, 36 insertions(+) diff --git a/net-analyzer/zmap/files/zmap-4.3.2-cmake.patch b/net-analyzer/zmap/files/zmap-4.3.2-cmake.patch new file mode 100644 index 000000000000..683a5eb4d3ea --- /dev/null +++ b/net-analyzer/zmap/files/zmap-4.3.2-cmake.patch @@ -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 + diff --git a/net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch b/net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch new file mode 100644 index 000000000000..65388cc4d5c3 --- /dev/null +++ b/net-analyzer/zmap/files/zmap-4.3.2-pkgconfig.patch @@ -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") diff --git a/net-analyzer/zmap/zmap-4.3.2.ebuild b/net-analyzer/zmap/zmap-4.3.2.ebuild index a5db6a5b7bd5..b38620088d21 100644 --- a/net-analyzer/zmap/zmap-4.3.2.ebuild +++ b/net-analyzer/zmap/zmap-4.3.2.ebuild @@ -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() {
