diff mbox series

[styhead,19/27] libpam: use libdir in conditional

Message ID ba11742291bccc9ac4d30ca85b058576cbc17427.1729686660.git.steve@sakoman.com
State Accepted
Delegated to: Steve Sakoman
Headers show
Series [styhead,01/27] wpa-supplicant: Ignore CVE-2024-5290 | expand

Commit Message

Steve Sakoman Oct. 23, 2024, 12:34 p.m. UTC 
From: Daniel McGregor <daniel.mcgregor@vecima.com>

Using the usrmerge distro feature for this check causes the -native
variant's build to fail. Simplify the test to be correct for both
native and target builds.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 105e6fbdd28238cef41f280c0c28939b24d1a96e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-extended/pam/libpam_1.6.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/recipes-extended/pam/libpam_1.6.1.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb
index b9ef564f56..c9ef40bf23 100644
--- a/meta/recipes-extended/pam/libpam_1.6.1.bb
+++ b/meta/recipes-extended/pam/libpam_1.6.1.bb
@@ -155,7 +155,7 @@  do_install() {
 	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
 		echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
 	fi
-	if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then
+	if [ "${base_libdir}" != "${libdir}" ]; then
 		install -d ${D}/${libdir}/
 		mv ${D}/${base_libdir}/pkgconfig ${D}/${libdir}/
 	fi