This incorporates suggested changes for issues 6797 and 6809 from bugzilla, and a revised change for 6796. For 6796, the issue is that you can't just include <gnu/option-groups.h> in libc-symbols, so we may not always have the option group defines available. If it's always visible, glibc won't build for poky-tiny, because some code assumes that it can link against locale code if it finds HAVE_MBSTATE_T. So, for now, test defined() before testing the value of the option group feature test macro. It's possible that this will result in some code being compiled without HAVE_MBSTATE_T when it should in cases where option-groups.h wasn't included before libc-symbols.h, but I haven't found an actual example of a failure.
The reason HAVE_MBSTATE_T wasn't conditionalized in 2.19 is that it didn't exist in 2.19. Signed-off-by: Peter Seebach <[email protected]> --- .../glibc/glibc/eglibc-use-option-groups.patch | 25 +++---------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch index 40c7832..6ab4f21 100644 --- a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch +++ b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch @@ -2434,24 +2434,7 @@ Index: git/localedata/Makefile ifeq ($(run-built-tests),yes) # We have to generate locales -@@ -143,9 +161,13 @@ - $(addprefix $(objpfx),$(CTYPE_FILES)): %: \ - gen-locale.sh $(common-objpfx)locale/localedef Makefile \ - $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS)) -- @$(SHELL) gen-locale.sh $(common-objpfx) \ -- '$(built-program-cmd-before-env)' '$(run-program-env)' \ -- '$(built-program-cmd-after-env)' $@; \ -+ @$(SHELL) gen-locale.sh $(common-objpfx) \ -+ '$(if $(cross-localedef), \ -+ $(cross-localedef), \ -+ $(built-program-cmd-before-env) \ -+ $(run-program-env) \ -+ $(built-program-cmd-after-env))' \ -+ $@; \ - $(evaluate-test) - - $(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \ -@@ -213,6 +235,11 @@ +@@ -213,6 +231,11 @@ include SUPPORTED @@ -5065,8 +5048,8 @@ Index: git/posix/Makefile $(objpfx)bug-glob2-mem.out $(objpfx)tst-vfork3-mem.out \ $(objpfx)tst-fnmatch-mem.out $(objpfx)bug-regex36-mem.out +ifeq (y,$(OPTION_POSIX_REGEXP_GLIBC)) -+tests-special += $(objpfx)bug-regex14-mem $(objpfx)tst-rxspencer-no-utf8-mem \ -+ $(objpfx)tst-pcre-mem $(objpfx)tst-boost-mem ++tests-special += $(objpfx)bug-regex14-mem.out $(objpfx)tst-rxspencer-no-utf8-mem.out \ ++ $(objpfx)tst-pcre-mem $(objpfx)tst-boost-mem.out +endif + xtests-special += $(objpfx)bug-ga2-mem.out @@ -16469,7 +16452,7 @@ Index: git/include/libc-symbols.h -#define HAVE_MBSTATE_T 1 -#define HAVE_MBSRTOWCS 1 + -+#if __OPTION_EGLIBC_LOCALE_CODE ++#if defined(__OPTION_EGLIBC_LOCALE_CODE) && __OPTION_EGLIBC_LOCALE_CODE +# define HAVE_MBSTATE_T 1 +# define HAVE_MBSRTOWCS 1 +#endif -- 1.7.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
