Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/3.4.6/120-libstdc++-pic.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 339 bd5e0a849352
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> 
     1 diff -durN gcc-3.4.6.orig/libstdc++-v3/src/Makefile.am gcc-3.4.6/libstdc++-v3/src/Makefile.am

     2 --- gcc-3.4.6.orig/libstdc++-v3/src/Makefile.am	2004-04-16 21:08:35.000000000 +0200

     3 +++ gcc-3.4.6/libstdc++-v3/src/Makefile.am	2007-08-15 22:52:23.000000000 +0200

     4 @@ -210,6 +210,10 @@

     5  	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@

     6  

     7  

     8 +install-exec-local:

     9 +	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o

    10 +	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)

    11 +

    12  # Added bits to build debug library.

    13  if GLIBCXX_BUILD_DEBUG

    14  all-local: build_debug

    15 diff -durN gcc-3.4.6.orig/libstdc++-v3/src/Makefile.in gcc-3.4.6/libstdc++-v3/src/Makefile.in

    16 --- gcc-3.4.6.orig/libstdc++-v3/src/Makefile.in	2004-04-16 21:08:35.000000000 +0200

    17 +++ gcc-3.4.6/libstdc++-v3/src/Makefile.in	2007-08-15 22:52:23.000000000 +0200

    18 @@ -592,7 +592,7 @@

    19  

    20  install-data-am: install-data-local

    21  

    22 -install-exec-am: install-toolexeclibLTLIBRARIES

    23 +install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local

    24  

    25  install-info: install-info-am

    26  

    27 @@ -625,6 +625,7 @@

    28  	distclean-tags distdir dvi dvi-am info info-am install \

    29  	install-am install-data install-data-am install-data-local \

    30  	install-exec install-exec-am install-info install-info-am \

    31 +	install-exec-local \

    32  	install-man install-strip install-toolexeclibLTLIBRARIES \

    33  	installcheck installcheck-am installdirs maintainer-clean \

    34  	maintainer-clean-generic mostlyclean mostlyclean-compile \

    35 @@ -709,6 +710,11 @@

    36  install_debug:

    37  	(cd ${debugdir} && $(MAKE) \

    38  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)

    39 +

    40 +install-exec-local:

    41 +	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o

    42 +	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)

    43 +

    44  # Tell versions [3.59,3.63) of GNU make to not export all variables.

    45  # Otherwise a system limit (for SysV at least) may be exceeded.

    46  .NOEXPORT:
crosstool-ng