Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.1/160-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 313 2f223aafc7cb
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-4.2.1.orig/libstdc++-v3/src/Makefile.am gcc-4.2.1/libstdc++-v3/src/Makefile.am

     2 --- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.am	2006-07-28 06:57:34.000000000 +0200

     3 +++ gcc-4.2.1/libstdc++-v3/src/Makefile.am	2007-08-03 20:32:27.000000000 +0200

     4 @@ -257,6 +257,12 @@

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

     6  

     7  

     8 +install-exec-local:

     9 +ifeq ($(enable_shared),yes)

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

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

    12 +endif

    13 +

    14  # Added bits to build debug library.

    15  if GLIBCXX_BUILD_DEBUG

    16  all-local: build_debug

    17 diff -durN gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in gcc-4.2.1/libstdc++-v3/src/Makefile.in

    18 --- gcc-4.2.1.orig/libstdc++-v3/src/Makefile.in	2006-10-16 21:08:22.000000000 +0200

    19 +++ gcc-4.2.1/libstdc++-v3/src/Makefile.in	2007-08-03 20:32:27.000000000 +0200

    20 @@ -657,7 +657,7 @@

    21  

    22  install-data-am: install-data-local

    23  

    24 -install-exec-am: install-toolexeclibLTLIBRARIES

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

    26  

    27  install-info: install-info-am

    28  

    29 @@ -690,6 +690,7 @@

    30  	distclean-libtool distclean-tags distdir dvi dvi-am html \

    31  	html-am info info-am install install-am install-data \

    32  	install-data-am install-data-local install-exec \

    33 +	install-exec-local \

    34  	install-exec-am install-info install-info-am install-man \

    35  	install-strip install-toolexeclibLTLIBRARIES installcheck \

    36  	installcheck-am installdirs maintainer-clean \

    37 @@ -799,6 +800,13 @@

    38  install_debug:

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

    40  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)

    41 +

    42 +install-exec-local:

    43 +ifeq ($(enable_shared),yes)

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

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

    46 +endif

    47 +

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

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

    50  .NOEXPORT:
crosstool-ng