patches/binutils/2.20.1/240-ld_makefile.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 1700 |
eccc37dd1a25
|
| 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>
|
jocke@1700
|
1 |
Description: correct where ld scripts are installed
|
|
jocke@1700
|
2 |
Author: Chris Chimelis <chris@debian.org>
|
|
jocke@1700
|
3 |
|
|
yann@2088
|
4 |
diff -durN binutils-2.20.1.orig/ld/Makefile.am binutils-2.20.1/ld/Makefile.am
|
|
yann@2088
|
5 |
--- binutils-2.20.1.orig/ld/Makefile.am 2010-02-22 09:07:01.000000000 +0100
|
|
yann@2088
|
6 |
+++ binutils-2.20.1/ld/Makefile.am 2010-08-17 19:32:21.000000000 +0200
|
|
yann@2088
|
7 |
@@ -24,7 +24,7 @@
|
|
jocke@1700
|
8 |
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
|
jocke@1700
|
9 |
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
|
jocke@1700
|
10 |
# directives need to be different for native and cross linkers.
|
|
jocke@1700
|
11 |
-scriptdir = $(tooldir)/lib
|
|
jocke@1700
|
12 |
+scriptdir = $(libdir)
|
|
jocke@1700
|
13 |
|
|
jocke@1700
|
14 |
EMUL = @EMUL@
|
|
jocke@1700
|
15 |
EMULATION_OFILES = @EMULATION_OFILES@
|
|
yann@2088
|
16 |
diff -durN binutils-2.20.1.orig/ld/Makefile.in binutils-2.20.1/ld/Makefile.in
|
|
yann@2088
|
17 |
--- binutils-2.20.1.orig/ld/Makefile.in 2010-03-03 15:06:21.000000000 +0100
|
|
yann@2088
|
18 |
+++ binutils-2.20.1/ld/Makefile.in 2010-08-17 19:32:21.000000000 +0200
|
|
yann@2088
|
19 |
@@ -333,7 +333,7 @@
|
|
jocke@1700
|
20 |
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
|
jocke@1700
|
21 |
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
|
jocke@1700
|
22 |
# directives need to be different for native and cross linkers.
|
|
jocke@1700
|
23 |
-scriptdir = $(tooldir)/lib
|
|
jocke@1700
|
24 |
+scriptdir = $(libdir)
|
|
jocke@1700
|
25 |
BASEDIR = $(srcdir)/..
|
|
jocke@1700
|
26 |
BFDDIR = $(BASEDIR)/bfd
|
|
jocke@1700
|
27 |
INCDIR = $(BASEDIR)/include
|