<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 12pt;
font-family:Calibri
}
--></style></head>
<body class='hmmessage'><div dir='ltr'>ping.<br><br><br><div>> From: jurobystricky@hotmail.com<br>> To: openembedded-core@lists.openembedded.org<br>> CC: sgw@linux.intel.com; peter.seebach@windriver.com<br>> Subject: [PATCH] eglibc-use-option-groups.patch: Various fixups<br>> Date: Sun, 23 Nov 2014 09:44:17 -0800<br>> <br>> Build suppport for mutibyte character handling only when<br>> __OPTION_EGLIBC_LOCALE_CODE evaluates to 1.<br>> Fixes missing .out suffix for several tests to be built.<br>> Fixes building of locales needed for several tests. Do not use<br>> cross-localedef to build locales. Use localedef built with the<br>> newly built libgc instead.<br>> <br>> Fixes:<br>> [YOCTO #6809] [YOCTO #6796] [YOCTO #6797]<br>> <br>> Signed-off-by: Juro Bystricky <jurobystricky@hotmail.com><br>> ---<br>> .../glibc/glibc/eglibc-use-option-groups.patch | 43 ++--------------------<br>> 1 file changed, 4 insertions(+), 39 deletions(-)<br>> <br>> diff --git a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch<br>> index 40c7832..0e2f0c6 100644<br>> --- a/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch<br>> +++ b/meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch<br>> @@ -2434,24 +2434,7 @@ Index: git/localedata/Makefile<br>> <br>> ifeq ($(run-built-tests),yes)<br>> # We have to generate locales<br>> -@@ -143,9 +161,13 @@<br>> - $(addprefix $(objpfx),$(CTYPE_FILES)): %: \<br>> - gen-locale.sh $(common-objpfx)locale/localedef Makefile \<br>> - $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS))<br>> -- @$(SHELL) gen-locale.sh $(common-objpfx) \<br>> -- '$(built-program-cmd-before-env)' '$(run-program-env)' \<br>> -- '$(built-program-cmd-after-env)' $@; \<br>> -+ @$(SHELL) gen-locale.sh $(common-objpfx) \<br>> -+ '$(if $(cross-localedef), \<br>> -+ $(cross-localedef), \<br>> -+ $(built-program-cmd-before-env) \<br>> -+ $(run-program-env) \<br>> -+ $(built-program-cmd-after-env))' \<br>> -+ $@; \<br>> - $(evaluate-test)<br>> - <br>> - $(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \<br>> -@@ -213,6 +235,11 @@<br>> +@@ -213,6 +231,11 @@<br>> <br>> include SUPPORTED<br>> <br>> @@ -4783,7 +4766,7 @@ Index: git/posix/fnmatch.c<br>> # endif<br>> <br>> -# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS) || _LIBC<br>> -+# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS) || (_LIBC && __OPTION_EGLIBC_LOCALE_CODE)<br>> ++# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS && _LIBC && __OPTION_EGLIBC_LOCALE_CODE)<br>> /* In this case we are implementing the multibyte character handling. */<br>> # define HANDLE_MULTIBYTE 1<br>> # endif<br>> @@ -5065,8 +5048,8 @@ Index: git/posix/Makefile<br>> $(objpfx)bug-glob2-mem.out $(objpfx)tst-vfork3-mem.out \<br>> $(objpfx)tst-fnmatch-mem.out $(objpfx)bug-regex36-mem.out<br>> +ifeq (y,$(OPTION_POSIX_REGEXP_GLIBC))<br>> -+tests-special += $(objpfx)bug-regex14-mem $(objpfx)tst-rxspencer-no-utf8-mem \<br>> -+ $(objpfx)tst-pcre-mem $(objpfx)tst-boost-mem<br>> ++tests-special += $(objpfx)bug-regex14-mem.out $(objpfx)tst-rxspencer-no-utf8-mem.out \<br>> ++ $(objpfx)tst-pcre-mem.out $(objpfx)tst-boost-mem.out<br>> +endif<br>> +<br>> xtests-special += $(objpfx)bug-ga2-mem.out<br>> @@ -16458,24 +16441,6 @@ Index: git/sysdeps/nptl/small-macros-fns.c<br>> +libc_hidden_def (__libc_lock_unlock_recursive_fn);<br>> +<br>> +#endif /*defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)*/<br>> -Index: git/include/libc-symbols.h<br>> -===================================================================<br>> ---- git.orig/include/libc-symbols.h 2014-08-29 20:00:47.144070587 -0700<br>> -+++ git/include/libc-symbols.h 2014-08-29 20:01:15.248070587 -0700<br>> -@@ -60,8 +60,11 @@<br>> - /* Define these macros for the benefit of portable GNU code that wants to check<br>> - them. Of course, STDC_HEADERS is never false when building libc! */<br>> - #define STDC_HEADERS 1<br>> --#define HAVE_MBSTATE_T 1<br>> --#define HAVE_MBSRTOWCS 1<br>> -+<br>> -+#if __OPTION_EGLIBC_LOCALE_CODE<br>> -+# define HAVE_MBSTATE_T 1<br>> -+# define HAVE_MBSRTOWCS 1<br>> -+#endif<br>> - #define HAVE_LIBINTL_H 1<br>> - #define HAVE_WCTYPE_H 1<br>> - #define HAVE_ISWCTYPE 1<br>> Index: git/crypt/crypt_common.c<br>> ===================================================================<br>> --- /dev/null 1970-01-01 00:00:00.000000000 +0000<br>> -- <br>> 1.9.1<br>> <br></div> </div></body>
</html>