patches/glibc/2.13/910-typedef-caddr.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
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@2438
     1
diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
yann@2438
     2
--- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
yann@2438
     3
+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
yann@2438
     4
@@ -114,7 +114,10 @@
yann@2438
     5
 #ifdef	__USE_BSD
yann@2438
     6
 # ifndef __daddr_t_defined
yann@2438
     7
 typedef __daddr_t daddr_t;
yann@2438
     8
+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
yann@2438
     9
 typedef __caddr_t caddr_t;
yann@2438
    10
+#   define __caddr_t_defined
yann@2438
    11
+#  endif
yann@2438
    12
 #  define __daddr_t_defined
yann@2438
    13
 # endif
yann@2438
    14
 #endif
yann@2438
    15
diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
yann@2438
    16
--- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
yann@2438
    17
+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
yann@2438
    18
@@ -80,7 +80,10 @@
yann@2438
    19
 #endif
yann@2438
    20
 #ifndef __daddr_t_defined
yann@2438
    21
 typedef __daddr_t daddr_t;
yann@2438
    22
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
yann@2438
    23
 typedef __caddr_t caddr_t;
yann@2438
    24
+#  define __caddr_t_defined
yann@2438
    25
+# endif
yann@2438
    26
 # define __daddr_t_defined
yann@2438
    27
 #endif
yann@2438
    28