[oe-commits] Richard Tollerton : shadow: Fix build when DISTRO_FEATURES contains pam, libc-crypt

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dylan
Commit: dd164ba9c367417d7c137729642f6bc5e23fca79
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dd164ba9c367417d7c137729642f6bc5e23fca79

Author: Richard Tollerton <rich.tollerton at ni.com>
Date:   Wed Jul 31 13:33:10 2013 -0500

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 master rev: f68eccd67a3f9ed0d62e5ab75545891bd724daa3)

Signed-off-by: Richard Tollerton <rich.tollerton at ni.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/shadow/shadow_4.1.4.3.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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 caf24c0..108e11e 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 \