From 8597073574d62f528526b7fefce06c15660d8142 Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Wed, 31 Jul 2013 13:33:10 -0500 Subject: [PATCH] shadow: Fix build when DISTRO_FEATURES contains pam, libc-crypt shadow falsely assumes that if --enable-libpam is set, it doesn't need to link against libcrypt; this breaks chsh. (This same fix exists in Arch.) (From OE-Core rev: f68eccd67a3f9ed0d62e5ab75545891bd724daa3) Signed-off-by: Richard Tollerton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb index 173da3b..af67339 100644 --- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb @@ -37,6 +37,10 @@ EXTRA_OECONF += "--without-audit \ --without-selinux" EXTRA_OECONF_libc-uclibc += "--with-nscd=no" +# Build falsely assumes that if --enable-libpam is set, we don't need to link against +# libcrypt. This breaks chsh. +BUILD_LDFLAGS += "${@base_contains('DISTRO_FEATURES', 'pam', base_contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}" + PAM_PLUGINS = "libpam-runtime \ pam-plugin-faildelay \ pam-plugin-securetty \ -- 2.7.4