summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2013-07-31 13:33:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:09 +0100
commit46e50e3703c822b4c2d7beb6873f3835274f4302 (patch)
tree3775a22ce2716e44798508be120058e9bf111e64 /meta/recipes-extended
parent4813e2d56585d276c7c8ddd2c13d3b41feb231a6 (diff)
downloadpoky-46e50e3703c822b4c2d7beb6873f3835274f4302.tar.gz
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 <rich.tollerton@ni.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.3.bb4
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 173da3b0f0..af67339d99 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 \
37 --without-selinux" 37 --without-selinux"
38EXTRA_OECONF_libc-uclibc += "--with-nscd=no" 38EXTRA_OECONF_libc-uclibc += "--with-nscd=no"
39 39
40# Build falsely assumes that if --enable-libpam is set, we don't need to link against
41# libcrypt. This breaks chsh.
42BUILD_LDFLAGS += "${@base_contains('DISTRO_FEATURES', 'pam', base_contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}"
43
40PAM_PLUGINS = "libpam-runtime \ 44PAM_PLUGINS = "libpam-runtime \
41 pam-plugin-faildelay \ 45 pam-plugin-faildelay \
42 pam-plugin-securetty \ 46 pam-plugin-securetty \