patches/glibc/ports-2.12.1/140-disable-ldconfig.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@2437
     1
do not bother running ldconfig on DESTDIR.  it wants to write the temp cache
yann@2437
     2
file outside of the chroot.  doesnt matter anyways as we wont use the cache
yann@2437
     3
results (portage will rebuild cache), so running ldconfig is simply a waste
yann@2437
     4
of time.
yann@2437
     5
yann@2437
     6
diff -durN glibc-2.12.1.orig/Makefile glibc-2.12.1/Makefile
yann@2437
     7
--- glibc-2.12.1.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
yann@2437
     8
+++ glibc-2.12.1/Makefile	2009-11-13 00:49:49.000000000 +0100
yann@2437
     9
@@ -116,6 +116,7 @@
yann@2437
    10
 	rm -f $(symbolic-link-list)
yann@2437
    11
 
yann@2437
    12
 install:
yann@2437
    13
+dont-bother-with-destdir:
yann@2437
    14
 	-test ! -x $(common-objpfx)elf/ldconfig || LC_ALL=C LANGUAGE=C \
yann@2437
    15
 	  $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \
yann@2437
    16
 				       $(slibdir) $(libdir)