patches/glibc/2.7/160-build_wcs_upper_buffer.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 744 4bf8448536d5
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
yann@541
     1
Matthias Kaehlcke <matthias at kaehlcke dot net> writes:
yann@541
     2
yann@541
     3
A compilation of an ARM toolchain with glibc 2.7 using crosstool-ng
yann@541
     4
failed with a gcc error in glibc-2.7/posix/regex_internal.c, more
yann@541
     5
concretly in the function build_wcs_upper_buffer(). The return type of
yann@541
     6
the function prototype in regex_internal.h doesn't correspond with the
yann@541
     7
return type of this function in regex_internal.c.
yann@541
     8
yann@541
     9
The attached patch corrects the return type of the function prototype
yann@541
    10
in regex_internal.h
yann@541
    11
yann@541
    12
--- glibc-2.7/posix/regex_internal.h.org	2008-05-30 11:16:01.000000000 +0200
yann@541
    13
+++ glibc-2.7/posix/regex_internal.h	2008-05-30 11:16:35.000000000 +0200
yann@541
    14
@@ -391,7 +391,7 @@
yann@541
    15
      internal_function;
yann@541
    16
 # ifdef RE_ENABLE_I18N
yann@541
    17
 static void build_wcs_buffer (re_string_t *pstr) internal_function;
yann@541
    18
-static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;
yann@541
    19
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) internal_function;
yann@541
    20
 # endif /* RE_ENABLE_I18N */
yann@541
    21
 static void build_upper_buffer (re_string_t *pstr) internal_function;
yann@541
    22
 static void re_string_translate_buffer (re_string_t *pstr) internal_function;