]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
libpam: use libdir in conditional dankm/sstate
authorDaniel McGregor <daniel.mcgregor@vecima.com>
Wed, 13 Apr 2022 02:24:50 +0000 (20:24 -0600)
committerDaniel McGregor <daniel.mcgregor@vecima.com>
Tue, 27 Sep 2022 15:19:07 +0000 (09:19 -0600)
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>
meta/recipes-extended/pam/libpam_1.5.2.bb

index bde7fef8a26801f05669f0349d750097df5101eb..1c97a1690670c2e883337918e1bb315bd73e5d73 100644 (file)
@@ -148,7 +148,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