Signed-off-by: Khem Raj <[email protected]>
---
meta/recipes-core/uclibc/uclibc-config.inc | 4 +++-
meta/recipes-core/uclibc/uclibc.inc | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc-config.inc
b/meta/recipes-core/uclibc/uclibc-config.inc
index 8bb0948..f32e6ee 100644
--- a/meta/recipes-core/uclibc/uclibc-config.inc
+++ b/meta/recipes-core/uclibc/uclibc-config.inc
@@ -95,15 +95,17 @@ def uclibc_cfg(feature, features, tokens, cnf, rem):
def features_to_uclibc_settings(d):
cnf, rem = ([], [])
distro_features = d.getVar('DISTRO_FEATURES', True).split()
+ tune_features = d.getVar('AVAILTUNES', True).split()
uclibc_cfg('ipv4', distro_features, 'UCLIBC_HAS_IPV4', cnf, rem)
uclibc_cfg('ipv6', distro_features, 'UCLIBC_HAS_IPV6', cnf, rem)
uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem)
uclibc_cfg('nls', distro_features, 'UCLIBC_HAS_LOCALE', cnf, rem)
- uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem)
uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem)
uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem)
uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem)
uclibc_cfg('libc-posix-clang-wchar',
distro_features,'UCLIBC_HAS_WCHAR', cnf, rem)
+ uclibc_cfg('thumbmode', tune_features,'COMPILE_IN_THUMB_MODE', cnf, rem)
+ uclibc_cfg('thumb-interwork', tune_features,'USE_BX', cnf, rem)
return "\n".join(cnf), "\n".join(rem)
# X, Y = ${@features_to_uclibc_settings(d)}
# unfortunately doesn't seem to work with bitbake, workaround:
diff --git a/meta/recipes-core/uclibc/uclibc.inc
b/meta/recipes-core/uclibc/uclibc.inc
index 5e9e2e9..b797d3f 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -124,7 +124,6 @@ configmangle = '/^KERNEL_HEADERS/d; \
/^SHARED_LIB_LOADER_PREFIX/d; \
/^UCLIBC_EXTRA_CFLAGS/d; \
s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
-
${@["","s,.*COMPILE_IN_THUMB_MODE.*,COMPILE_IN_THUMB_MODE=y,;"][d.getVar("ARM_INSTRUCTION_SET",
1) != "arm"]} \
${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][d.getVar("USE_NLS", 1)
== "yes"]} \
${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is
not set,;"][d.getVar("TARGET_ARCH", 1) in ['mips', 'mipsel', 'mips64',
'mips64el', 'avr32']]} \
/^CROSS/d; \
--
1.7.5.4
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
