v2: option groups fixup
cover v2: option groups fixup
This is like the previous one, only it's been updated to use a conditional test on HAVE_MBSTATE_T so it doesn't break poky-tiny.
The following changes since commit 33b7885ecdc8774e34ac3534ec49fed6ffdb3916:
oprofile: 0.9.9 -> 1.0.0 (2014-11-09 10:19:58 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib seebs/optiongroups2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/optiongroups2
Peter Seebach (1):
eglibc-use-option-groups.patch: Minor fixups.
.../glibc/glibc/eglibc-use-option-groups.patch | 25 +++---------------- 1 files changed, 4 insertions(+), 21 deletions(-)
PATCH 1/1 eglibc-use-option-groups.patch: Minor fixups.
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.
--- .../glibc/glibc/eglibc-use-option-groups.patch | 25 +++---------------- 1 files changed, 4 insertions(+), 21 deletions(-)
meta/recipes-core/glibc/glibc/eglibc-use-option-groups.patch +4 -21
@@ -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
Signature · 1 line
1.7.1
Quoted 13 lines · Peter Seebach
This is like the previous one, only it's been updated to use a conditional test on
HAVE_MBSTATE_Tso it doesn't break poky-tiny.The following changes since commit
33b7885ecdc8774e34ac3534ec49fed6ffdb3916:oprofile: 0.9.9 -> 1.0.0 (2014-11-09 10:19:58 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contribseebs/optiongroups2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/optiongroups2
Quoted 6 lines
Peter Seebach (1):
eglibc-use-option-groups.patch: Minor fixups..../glibc/glibc/eglibc-use-option-groups.patch | 25 +++---------------- 1 files changed, 4 insertions(+), 21 deletions(-)
Shouldn't the patch contain
...
++ $(objpfx)tst-pcre-mem.out $(objpfx)tst-boost-mem.out
...
instead of
...
++ $(objpfx)tst-pcre-mem $(objpfx)tst-boost-mem.out
...
?