commit: e3f451ed3bc92ad6acce714773f3164920b23bce Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Mar 3 18:52:58 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Mar 3 18:52:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f451ed
sys-libs/pam: fixup berkdb handling for meson Closes: https://bugs.gentoo.org/950501 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild index b42232e6d573..a883d62048f2 100644 --- a/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild +++ b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild @@ -114,9 +114,6 @@ multilib_src_configure() { -Dhtmldir="${EPREFIX}"/usr/share/doc/${PF}/html -Dpdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf - -Ddb=$(usex berkdb 'db' 'gdbm') - -Ddb-uniquename=$(db_findver sys-libs/db) - $(meson_native_enabled docs) -Dpam_unix=enabled @@ -132,6 +129,20 @@ multilib_src_configure() { $(meson_feature !elibc_musl pam_lastlog) ) + if use berkdb; then + local dbver + dbver="$(db_findver sys-libs/db)" || die "could not find db version" + local -x CPPFLAGS="${CPPFLAGS} -I$(db_includedir "${dbver}")" + emesonargs+=( + -Ddb=db + -Ddb-uniquename="-${dbver}" + ) + else + emesonargs+=( + -Ddb=gdbm + ) + fi + # This whole weird has_version libxcrypt block can go once # musl systems have libxcrypt[system] if we ever make # that mandatory. See bug #867991.
