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 "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 339 bd5e0a849352
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-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