diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-02-26 18:27:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-28 13:21:54 +0000 |
commit | 9d973d3b4ed8d2ce3c8997dc21603a0952e7ef0e (patch) | |
tree | d82567893852c0134a574f1c45ce7db7b90c2fd0 /meta/recipes-extended | |
parent | 561ff52c516990c769681446c22d516eb6b91461 (diff) | |
download | poky-9d973d3b4ed8d2ce3c8997dc21603a0952e7ef0e.tar.gz |
default-distrovars: Drop DISTRO_FEATURES_LIBC
After eglibc was merged into glibc, Kconfig support was also dropped so
these libc features therefore are not effective anymore and can be
removed
(From OE-Core rev: c62b1cc06613a4cdddf53290e6203559f43fc62d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/findutils/findutils_4.6.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow_4.6.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/findutils/findutils_4.6.0.bb b/meta/recipes-extended/findutils/findutils_4.6.0.bb index 5e4ca94868..3b62ed9962 100644 --- a/meta/recipes-extended/findutils/findutils_4.6.0.bb +++ b/meta/recipes-extended/findutils/findutils_4.6.0.bb | |||
@@ -16,6 +16,6 @@ SRC_URI[md5sum] = "9936aa8009438ce185bea2694a997fc1" | |||
16 | SRC_URI[sha256sum] = "ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d" | 16 | SRC_URI[sha256sum] = "ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d" |
17 | 17 | ||
18 | # http://savannah.gnu.org/bugs/?27299 | 18 | # http://savannah.gnu.org/bugs/?27299 |
19 | CACHED_CONFIGUREVARS += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}" | 19 | CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" |
20 | 20 | ||
21 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" | 21 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" |
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 09c37ef8a3..2b20bdcb25 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -57,7 +57,7 @@ EXTRA_OECONF += "--without-audit \ | |||
57 | NSCDOPT = "" | 57 | NSCDOPT = "" |
58 | NSCDOPT_class-native = "--without-nscd" | 58 | NSCDOPT_class-native = "--without-nscd" |
59 | NSCDOPT_class-nativesdk = "--without-nscd" | 59 | NSCDOPT_class-nativesdk = "--without-nscd" |
60 | NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}" | 60 | NSCDOPT_libc-glibc = "--with-nscd" |
61 | 61 | ||
62 | PAM_PLUGINS = "libpam-runtime \ | 62 | PAM_PLUGINS = "libpam-runtime \ |
63 | pam-plugin-faildelay \ | 63 | pam-plugin-faildelay \ |
diff --git a/meta/recipes-extended/shadow/shadow_4.6.bb b/meta/recipes-extended/shadow/shadow_4.6.bb index 5675cb8cc9..c975395ff8 100644 --- a/meta/recipes-extended/shadow/shadow_4.6.bb +++ b/meta/recipes-extended/shadow/shadow_4.6.bb | |||
@@ -2,7 +2,7 @@ require shadow.inc | |||
2 | 2 | ||
3 | # Build falsely assumes that if --enable-libpam is set, we don't need to link against | 3 | # Build falsely assumes that if --enable-libpam is set, we don't need to link against |
4 | # libcrypt. This breaks chsh. | 4 | # libcrypt. This breaks chsh. |
5 | BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', bb.utils.contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}" | 5 | BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}" |
6 | 6 | ||
7 | BBCLASSEXTEND = "native nativesdk" | 7 | BBCLASSEXTEND = "native nativesdk" |
8 | 8 | ||