diff options
author | Richard Tollerton <rich.tollerton@ni.com> | 2013-07-31 13:33:10 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-12 13:14:20 +0100 |
commit | bc5e808f01f4863b401c75be582ae1d64cb681da (patch) | |
tree | 3070c2726dd795a9a9651089313a6e02896c3e61 /meta | |
parent | 7a1eba6304dd8f27c12ae73a4dddbe9f41b9192a (diff) | |
download | poky-bc5e808f01f4863b401c75be582ae1d64cb681da.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 master rev: f68eccd67a3f9ed0d62e5ab75545891bd724daa3)
(From OE-Core rev: dd164ba9c367417d7c137729642f6bc5e23fca79)
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')
-rw-r--r-- | 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 caf24c06af..108e11e481 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" |
38 | EXTRA_OECONF_libc-uclibc += "--with-nscd=no" | 38 | EXTRA_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. | ||
42 | BUILD_LDFLAGS += "${@base_contains('DISTRO_FEATURES', 'pam', base_contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}" | ||
43 | |||
40 | PAM_PLUGINS = "libpam-runtime \ | 44 | PAM_PLUGINS = "libpam-runtime \ |
41 | pam-plugin-faildelay \ | 45 | pam-plugin-faildelay \ |
42 | pam-plugin-securetty \ | 46 | pam-plugin-securetty \ |