Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam_wrapper/
Date: Sun, 21 Nov 2021 22:35:44
Message-Id: 1637534136.834518e670c13f7ccfcf8bff134074f36f404930.floppym@gentoo
1 commit: 834518e670c13f7ccfcf8bff134074f36f404930
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 21 22:32:49 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 21 22:35:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=834518e6
7
8 sys-libs/pam_wrapper: let cmake find libpam
9
10 pam_wrapper will still need to be rebuilt when libpam changes location,
11 but at least this lets it work after a rebuild.
12
13 Closes: https://bugs.gentoo.org/825078
14 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
15
16 .../{pam_wrapper-1.1.3-r2.ebuild => pam_wrapper-1.1.3-r3.ebuild} | 8 --------
17 1 file changed, 8 deletions(-)
18
19 diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r3.ebuild
20 similarity index 87%
21 rename from sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild
22 rename to sys-libs/pam_wrapper/pam_wrapper-1.1.3-r3.ebuild
23 index d2d118a5478a..d71310d9c7c2 100644
24 --- a/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild
25 +++ b/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r3.ebuild
26 @@ -33,10 +33,7 @@ DEPEND="
27
28 multilib_src_configure() {
29 configure_for_python() {
30 - local libpam="${EPREFIX}/$(get_libdir)/libpam.so.0"
31 -
32 local mycmakeargs=(
33 - -DPAM_LIBRARY="${libpam}"
34 -DUNIT_TESTING=OFF
35 )
36
37 @@ -50,12 +47,7 @@ multilib_src_configure() {
38 fi
39
40 # Do the regular build now
41 - local libpam="${EPREFIX}"
42 - multilib_is_native_abi || libpam+="/usr"
43 - libpam+="/$(get_libdir)/libpam.so.0"
44 -
45 local mycmakeargs=(
46 - -DPAM_LIBRARY="${libpam}"
47 -DUNIT_TESTING=$(usex test)
48 -DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON
49 )