"Khem Raj" <[email protected]> wrote: >* Look for disabled features in DISTRO_FEATURES and disable them while >building eglibc >* By default all features are built >* One can disable a feature by specifying DISTRO_FEATURES += "noinet6 >nobsd ...." e.g. > >Signed-off-by: Khem Raj <[email protected]> >--- >recipes/eglibc/eglibc-options.inc | 50 >+++++++++++++++++++++++++++++++++++++ > recipes/eglibc/eglibc.inc | 7 ++++- > 2 files changed, 56 insertions(+), 1 deletions(-) > create mode 100644 recipes/eglibc/eglibc-options.inc > >diff --git a/recipes/eglibc/eglibc-options.inc >b/recipes/eglibc/eglibc-options.inc >new file mode 100644 >index 0000000..d552bbc >--- /dev/null >+++ b/recipes/eglibc/eglibc-options.inc >@@ -0,0 +1,50 @@ >+def eglibc_cfg(feature, features, tokens, cnf ): >+ if type(tokens) == type(""): >+ tokens = [tokens] >+ if type(features) == type([]) and feature in features: >+ cnf.extend([token + ' = n' for token in tokens]) >+ >+# Map distro features to eglibc options settings >+def features_to_eglibc_settings(d): >+ cnf = ([]) >+ distro_features = bb.data.getVar('DISTRO_FEATURES', d, >True).split() >+ eglibc_cfg('noinet6', distro_features, >'OPTION_EGLIBC_ADVANCED_INET6', cnf) >+ eglibc_cfg('nobacktrace', distro_features, >'OPTION_EGLIBC_BACKTRACE', cnf) >+ eglibc_cfg('nobig-macros', distro_features, >'OPTION_EGLIBC_BIG_MACROS', cnf) >+ eglibc_cfg('nobsd', distro_features, 'OPTION_EGLIBC_BSD', >cnf) >+ eglibc_cfg('nocxx-tests', distro_features, >'OPTION_EGLIBC_CXX_TESTS', cnf) >+ eglibc_cfg('nocatgets', distro_features, >'OPTION_EGLIBC_CATGETS', cnf) >+ eglibc_cfg('nocharsets', distro_features, >'OPTION_EGLIBC_CHARSETS', cnf) >+ eglibc_cfg('nocrypt', distro_features, >'OPTION_EGLIBC_CRYPT', cnf) >+ eglibc_cfg('nocrypt-ufc', distro_features, >'OPTION_EGLIBC_CRYPT_UFC', cnf) >+ eglibc_cfg('nodb-aliases', distro_features, >'OPTION_EGLIBC_DB_ALIASES', cnf) >+ eglibc_cfg('noenvz', distro_features, >'OPTION_EGLIBC_ENVZ', cnf) >+ eglibc_cfg('nofcvt', distro_features, >'OPTION_EGLIBC_FCVT', cnf) >+ eglibc_cfg('nofmtmsg', distro_features, >'OPTION_EGLIBC_FMTMSG', cnf) >+ eglibc_cfg('nofstab', distro_features, >'OPTION_EGLIBC_FSTAB', cnf) >+ eglibc_cfg('noftraverse', distro_features, >'OPTION_EGLIBC_FTRAVERSE', cnf) >+ eglibc_cfg('nogetlogin', distro_features, >'OPTION_EGLIBC_GETLOGIN', cnf) >+ eglibc_cfg('noidn', distro_features, 'OPTION_EGLIBC_IDN', >cnf) >+ eglibc_cfg('noinet', distro_features, >'OPTION_EGLIBC_INET', cnf) >+ eglibc_cfg('noinet-anl', distro_features, >'OPTION_EGLIBC_INET_ANL', cnf) >+ eglibc_cfg('nolibm', distro_features, >'OPTION_EGLIBC_LIBM', cnf) >+ eglibc_cfg('nolibm-big', distro_features, >'OPTION_EGLIBC_LIBM_BIG', cnf) >+ eglibc_cfg('nolocales', distro_features, >'OPTION_EGLIBC_LOCALES', cnf) >+ eglibc_cfg('nolocale-code', distro_features, >'OPTION_EGLIBC_LOCALE_CODE', cnf) >+ eglibc_cfg('nomemusage', distro_features, >'OPTION_EGLIBC_MEMUSAGE', cnf) >+ eglibc_cfg('nonis', distro_features, 'OPTION_EGLIBC_NIS', >cnf) >+ eglibc_cfg('nonsswitch', distro_features, >'OPTION_EGLIBC_NSSWITCH', cnf) >+ eglibc_cfg('norcmd', distro_features, >'OPTION_EGLIBC_RCMD', cnf) >+ eglibc_cfg('nortld-debug', distro_features, >'OPTION_EGLIBC_RTLD_DEBUG', cnf) >+ eglibc_cfg('nospawn', distro_features, >'OPTION_EGLIBC_SPAWN', cnf) >+ eglibc_cfg('nostreams', distro_features, >'OPTION_EGLIBC_STREAMS', cnf) >+ eglibc_cfg('nosunrpc', distro_features, >'OPTION_EGLIBC_SUNRPC', cnf) >+ eglibc_cfg('noutmp', distro_features, >'OPTION_EGLIBC_UTMP', cnf) >+ eglibc_cfg('noutmpx', distro_features, >'OPTION_EGLIBC_UTMPX', cnf) >+ eglibc_cfg('nowordexp', distro_features, >'OPTION_EGLIBC_WORDEXP', cnf) >+ eglibc_cfg('noposix-clang-wchar', distro_features, >'OPTION_POSIX_C_LANG_WIDE_CHAR', cnf) >+ eglibc_cfg('noposix-regexp', distro_features, >'OPTION_POSIX_REGEXP', cnf) >+ eglibc_cfg('noposix-regexp-glibc', distro_features, >'OPTION_POSIX_REGEXP_GLIBC', cnf) >+ eglibc_cfg('noposix-wchar-io', distro_features, >'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf) >+ return "\n".join(cnf) >+ >diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc >index 0644d49..c9765dd 100644 >--- a/recipes/eglibc/eglibc.inc >+++ b/recipes/eglibc/eglibc.inc >@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home"; > SECTION = "libs" > PRIORITY = "required" > LICENSE = "LGPL" >-INC_PR = "r19" >+INC_PR = "r20" ># nptl needs unwind support in gcc, which can't be built without glibc. >DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" > #this leads to circular deps, so lets not add it yet >@@ -17,6 +17,7 @@ RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" > PROVIDES_${PN}-dbg = "glibc-dbg" > > inherit autotools >+require eglibc-options.inc > > LEAD_SONAME = "libc.so" > >@@ -41,3 +42,7 @@ do_move_ports() { > mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/ > fi > } >+OE_FEATURES := "$...@features_to_eglibc_settings(d)}" >+do_configure_prepend() { >+ echo '${OE_FEATURES}' > ${S}/option-groups.config >+} >-- >1.7.2.3 > > >_______________________________________________ >Openembedded-devel mailing list >[email protected] >http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Hi, The logic should IMO be: Disable every feature unless explicitly specified otherwise. Take "ipv4" or "ipv6" (note: not inet6) as example: if noone asks for ipv6 then it is disabled. This is the logic we are already using for uClibc. _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
