patches/binutils/2.17/130-ld_makefile_patch.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 745 e445c00d134d
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@55
     1
diff -dur binutils-2.17.old/ld/Makefile.am binutils-2.17/ld/Makefile.am
yann@55
     2
--- binutils-2.17.old/ld/Makefile.am	2006-06-03 06:45:50.000000000 +0200
yann@55
     3
+++ binutils-2.17/ld/Makefile.am	2007-05-01 18:26:09.000000000 +0200
yann@55
     4
@@ -20,7 +20,7 @@
yann@55
     5
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@55
     6
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@55
     7
 # directives need to be different for native and cross linkers.
yann@55
     8
-scriptdir = $(tooldir)/lib
yann@55
     9
+scriptdir = $(libdir)
yann@55
    10
 
yann@55
    11
 EMUL = @EMUL@
yann@55
    12
 EMULATION_OFILES = @EMULATION_OFILES@
yann@55
    13
diff -dur binutils-2.17.old/ld/Makefile.in binutils-2.17/ld/Makefile.in
yann@55
    14
--- binutils-2.17.old/ld/Makefile.in	2006-06-03 06:45:50.000000000 +0200
yann@55
    15
+++ binutils-2.17/ld/Makefile.in	2007-05-01 18:26:09.000000000 +0200
yann@55
    16
@@ -269,7 +269,7 @@
yann@55
    17
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@55
    18
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@55
    19
 # directives need to be different for native and cross linkers.
yann@55
    20
-scriptdir = $(tooldir)/lib
yann@55
    21
+scriptdir = $(libdir)
yann@55
    22
 BASEDIR = $(srcdir)/..
yann@55
    23
 BFDDIR = $(BASEDIR)/bfd
yann@55
    24
 INCDIR = $(BASEDIR)/include