summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-libs/nss_wrapper')
-rw-r--r--sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch26
-rw-r--r--sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild14
2 files changed, 38 insertions, 2 deletions
diff --git a/sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch b/sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch
new file mode 100644
index 000000000000..503066dd30b9
--- /dev/null
+++ b/sys-libs/nss_wrapper/files/nss_wrapper-1.1.15-cmocka-cmake.patch
@@ -0,0 +1,26 @@
+https://git.samba.org/?p=nss_wrapper.git;a=commit;h=2c879a0ffa70cee33329291d7576ec971d420da2
+
+From 2c879a0ffa70cee33329291d7576ec971d420da2 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 17 Feb 2023 17:51:27 +0100
+Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ project(tests C)
+
++if (TARGET cmocka::cmocka)
++ set(CMOCKA_LIBRARY cmocka::cmocka)
++endif()
++
+ set(TESTSUITE_LIBRARIES nss_utils ${NWRAP_REQUIRED_LIBRARIES} ${CMOCKA_LIBRARY})
+ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+
+--
+2.34.1
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
index f2ca73072069..b99114af385b 100644
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,17 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc
IUSE="test"
RESTRICT="!test? ( test )"
-BDEPEND="test? ( dev-util/cmocka )"
+# sys-libs/uid_wrapper is used to "better test initgroups()" optionally
+BDEPEND="
+ test? (
+ dev-util/cmocka
+ sys-libs/uid_wrapper
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmocka-cmake.patch
+)
src_configure() {
local mycmakeargs=(