aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2013-07-31 13:33:10 -0500
committerSaul Wold <sgw@linux.intel.com>2013-08-02 08:01:39 -0700
commitf68eccd67a3f9ed0d62e5ab75545891bd724daa3 (patch)
tree24a9d1a5a9ee3ff88429f83a75be1704ab966867 /meta
parentf74b10cbbecdabcbef695bbdfd26ca4c35c7d369 (diff)
downloadopenembedded-core-f68eccd67a3f9ed0d62e5ab75545891bd724daa3.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.) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-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 \
--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 \