patches/strace/4.5.17/150-undef-CTL_PROC.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 747 d3e603e7c17c
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@974
     1
Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/150-undef-CTL_PROC.patch
yann@974
     2
-= BEGIN original header =-
yann@428
     3
diff -dur strace-4.5.16.orig/system.c strace-4.5.16/system.c
yann@974
     4
-= END original header =-
yann@974
     5
diff -durN strace-4.5.17.orig/system.c strace-4.5.17/system.c
yann@974
     6
--- strace-4.5.17.orig/system.c	2007-01-17 00:22:36.000000000 +0100
yann@974
     7
+++ strace-4.5.17/system.c	2008-10-24 21:30:13.000000000 +0200
yann@428
     8
@@ -1612,7 +1612,9 @@
yann@428
     9
 	{ CTL_KERN, "CTL_KERN" },
yann@428
    10
 	{ CTL_VM, "CTL_VM" },
yann@428
    11
 	{ CTL_NET, "CTL_NET" },
yann@428
    12
+#ifdef CTL_PROC
yann@428
    13
 	{ CTL_PROC, "CTL_PROC" },
yann@428
    14
+#endif
yann@428
    15
 	{ CTL_FS, "CTL_FS" },
yann@428
    16
 	{ CTL_DEBUG, "CTL_DEBUG" },
yann@428
    17
 	{ CTL_DEV, "CTL_DEV" },