diff options
| author |   Richard Tollerton <rich.tollerton@ni.com> | 2013-07-31 13:33:10 -0500 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-07 11:44:33 +0100 |
| commit | dd164ba9c367417d7c137729642f6bc5e23fca79 (patch) | |
| tree | 2b4fb86dbcb950e6b30ab33741d05e8a8fafa035 /meta | |
| parent | c3d71f0178212a4fe889bcc47e1d35327e858416 (diff) | |
| download | openembedded-core-dd164ba9c367417d7c137729642f6bc5e23fca79.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)
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 \ --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 \ |