patches/gcc/4.2.4/160-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 687 b2b6b1d46aa1
permissions -rw-r--r--
cc/gcc: cleanup the _or_later logic

So far, we've had a version always select appropriate _or_later option,
which in turn would select all previous _or_later options.

Because the dependencies on companion libs were cumulative, that was
working OK. But the upcoming 4.6 will no longer depend on libelf, so
we can't keep the cumulative scheme we've been using so far.

Have each release family select the corresponding dependencies, instead
of relying on selecting previous _or_later.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
     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: