patches/gcc/4.5.1/100-ecjx-host.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@2250
     1
diff -durN gcc-4.5.2.orig/libjava/Makefile.in gcc-4.5.2/libjava/Makefile.in
yann@2250
     2
--- gcc-4.5.2.orig/libjava/Makefile.in	2010-12-16 13:49:03.000000000 +0100
yann@2250
     3
+++ gcc-4.5.2/libjava/Makefile.in	2010-12-29 23:02:41.000000000 +0100
yann@2250
     4
@@ -9463,6 +9463,9 @@
yann@2250
     5
 ecjx$(EXEEXT): $(ecjx_OBJECTS) $(ecjx_DEPENDENCIES) 
yann@2250
     6
 	@rm -f ecjx$(EXEEXT)
yann@2250
     7
 	$(ecjx_LINK) $(ecjx_OBJECTS) $(ecjx_LDADD) $(LIBS)
yann@2250
     8
+ecjx.$(OBJEXT): $(ecjx_SOURCES)
yann@2250
     9
+	@rm -f ecjx.$(OBJEXT)
yann@2250
    10
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c -o $@ $<
yann@2250
    11
 gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
yann@2250
    12
 	@rm -f gappletviewer$(EXEEXT)
yann@2250
    13
 	$(gappletviewer_LINK) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)