Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.6/240-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
parent 2149 98b7806295cc
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 diff -durN gcc-4.4.5.orig/libstdc++-v3/src/Makefile.am gcc-4.4.5/libstdc++-v3/src/Makefile.am

     2 --- gcc-4.4.5.orig/libstdc++-v3/src/Makefile.am	2009-08-26 21:04:11.000000000 +0200

     3 +++ gcc-4.4.5/libstdc++-v3/src/Makefile.am	2010-10-09 23:03:26.000000000 +0200

     4 @@ -356,6 +356,13 @@

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

     6  

     7  

     8 +install-exec-local:

     9 +	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \

    10 +	if [ x"$$pic_objs" != x ]; then \

    11 +		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \

    12 +		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \

    13 +	fi

    14 +

    15  # Added bits to build debug library.

    16  if GLIBCXX_BUILD_DEBUG

    17  all-local: build_debug

    18 diff -durN gcc-4.4.5.orig/libstdc++-v3/src/Makefile.in gcc-4.4.5/libstdc++-v3/src/Makefile.in

    19 --- gcc-4.4.5.orig/libstdc++-v3/src/Makefile.in	2009-08-26 21:04:11.000000000 +0200

    20 +++ gcc-4.4.5/libstdc++-v3/src/Makefile.in	2010-10-09 23:03:26.000000000 +0200

    21 @@ -726,7 +726,7 @@

    22  

    23  install-data-am: install-data-local

    24  

    25 -install-exec-am: install-toolexeclibLTLIBRARIES

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

    27  

    28  install-info: install-info-am

    29  

    30 @@ -765,7 +765,7 @@

    31  	maintainer-clean-generic mostlyclean mostlyclean-compile \

    32  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

    33  	tags uninstall uninstall-am uninstall-info-am \

    34 -	uninstall-toolexeclibLTLIBRARIES

    35 +	uninstall-toolexeclibLTLIBRARIES install-exec-local

    36  

    37  

    38  # Symbol versioning for shared libraries.

    39 @@ -947,6 +947,14 @@

    40  install_debug:

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

    42  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)

    43 +

    44 +install-exec-local:

    45 +	pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \

    46 +	if [ x"$$pic_objs" != x ]; then \

    47 +		$(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \

    48 +		$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \

    49 +	fi

    50 +

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

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

    53  .NOEXPORT:
crosstool-ng