From f33289b98cf359d61a73d65e09cde432bacce4ef Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sat, 2 Oct 2021 22:33:22 -0500 Subject: [PATCH] sys-libs/pam: drop the use of gen_usr_ldscript This is not needed since we do not install a static version of the pam library. Package-Manager: Portage-3.0.20, Repoman-3.0.3 --- sys-libs/pam/pam-1.5.2.ebuild | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys-libs/pam/pam-1.5.2.ebuild b/sys-libs/pam/pam-1.5.2.ebuild index 12fb3126d89..ae6f1239b91 100644 --- a/sys-libs/pam/pam-1.5.2.ebuild +++ b/sys-libs/pam/pam-1.5.2.ebuild @@ -9,7 +9,7 @@ MY_P="Linux-${PN^^}-${PV}" # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979 TMPFILES_OPTIONAL=1 -inherit autotools db-use fcaps toolchain-funcs usr-ldscript multilib-minimal +inherit autotools db-use fcaps toolchain-funcs multilib-minimal DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" HOMEPAGE="https://github.com/linux-pam/linux-pam" @@ -59,9 +59,7 @@ multilib_src_configure() { CC_FOR_BUILD="$(tc-getBUILD_CC)" --with-db-uniquename=-$(db_findver sys-libs/db) --with-xml-catalog=/etc/xml/catalog - --enable-securedir=/$(get_libdir)/security - --includedir=/usr/include/security - --libdir=/usr/$(get_libdir) + --libdir=/$(get_libdir) --enable-pie --enable-unix --disable-prelude @@ -86,12 +84,12 @@ multilib_src_compile() { multilib_src_install() { emake DESTDIR="${D}" install \ sepermitlockdir="/run/sepermit" - - gen_usr_ldscript -a pam pam_misc pamc } multilib_src_install_all() { find "${ED}" -type f -name '*.la' -delete || die + dodir /usr/$(get_libdir) + mv "${ED}"/$(get_libdir)/pkgconfig "${ED}"/usr/$(get_libdir) || die # tmpfiles.eclass is impossible to use because # there is the pam -> tmpfiles -> systemd -> pam dependency loop -- 2.32.0