Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.4/190-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Oct 03 23:10:46 2010 +0200 (2010-10-03)
changeset 2130 b46ecc90d3ab
permissions -rw-r--r--
complibs: better deduce whether to backup complibs or not

To decide whether we need to backup the companion libraries,
do not rely on the !shared case. In the future other cases
may require not to save the companion libraries (eg. if using
the ones provided by the host distro).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 Original patch from: ../4.3.2/190-libstdc++-pic.patch

     2 

     3 -= BEGIN original header =-

     4 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/54_all_300-libstdc++-pic.patch

     5 install libstdc++_pic.a if we have pic objs

     6 

     7 -= END original header =-

     8 

     9 diff -durN gcc-4.3.3.orig/libstdc++-v3/src/Makefile.am gcc-4.3.3/libstdc++-v3/src/Makefile.am

    10 --- gcc-4.3.3.orig/libstdc++-v3/src/Makefile.am	2008-02-29 19:26:50.000000000 +0100

    11 +++ gcc-4.3.3/libstdc++-v3/src/Makefile.am	2009-01-27 22:19:34.000000000 +0100

    12 @@ -289,6 +289,13 @@

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

    14  

    15  

    16 +install-exec-local:

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

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

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

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

    21 +	fi

    22 +

    23  # Added bits to build debug library.

    24  if GLIBCXX_BUILD_DEBUG

    25  all-local: build_debug

    26 diff -durN gcc-4.3.3.orig/libstdc++-v3/src/Makefile.in gcc-4.3.3/libstdc++-v3/src/Makefile.in

    27 --- gcc-4.3.3.orig/libstdc++-v3/src/Makefile.in	2008-02-29 19:26:50.000000000 +0100

    28 +++ gcc-4.3.3/libstdc++-v3/src/Makefile.in	2009-01-27 22:19:34.000000000 +0100

    29 @@ -693,7 +693,7 @@

    30  

    31  install-data-am: install-data-local

    32  

    33 -install-exec-am: install-toolexeclibLTLIBRARIES

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

    35  

    36  install-info: install-info-am

    37  

    38 @@ -732,7 +732,7 @@

    39  	maintainer-clean-generic mostlyclean mostlyclean-compile \

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

    41  	tags uninstall uninstall-am uninstall-info-am \

    42 -	uninstall-toolexeclibLTLIBRARIES

    43 +	uninstall-toolexeclibLTLIBRARIES install-exec-local

    44  

    45  

    46  # Symbol versioning for shared libraries.

    47 @@ -858,6 +858,14 @@

    48  install_debug:

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

    50  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)

    51 +

    52 +install-exec-local:

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

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

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

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

    57 +	fi

    58 +

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

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

    61  .NOEXPORT:
crosstool-ng