Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.5/190-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jul 17 17:54:21 2011 +0200 (2011-07-17)
changeset 2888 dd71df95903a
parent 1461 35b30f8fb307
permissions -rw-r--r--
cc/gcc: pass the companion libs prefix to cc_core

In case of canadian-cross, the companion libraries are not the same for
the core cc (they run on 'build') as they are for the final cc (they run
on 'host').

Prepare for this differentiation (coming later), while retaining the
current behavior (to use the same compblibs).

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.5.orig/libstdc++-v3/src/Makefile.am gcc-4.3.5/libstdc++-v3/src/Makefile.am

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

    11 +++ gcc-4.3.5/libstdc++-v3/src/Makefile.am	2010-09-19 18:58:40.000000000 +0200

    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.5.orig/libstdc++-v3/src/Makefile.in gcc-4.3.5/libstdc++-v3/src/Makefile.in

    27 --- gcc-4.3.5.orig/libstdc++-v3/src/Makefile.in	2010-05-06 19:19:46.000000000 +0200

    28 +++ gcc-4.3.5/libstdc++-v3/src/Makefile.in	2010-09-19 19:01:43.000000000 +0200

    29 @@ -646,7 +646,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 @@ -685,7 +685,7 @@

    39  	mostlyclean mostlyclean-compile mostlyclean-generic \

    40  	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \

    41  	uninstall-am uninstall-info-am \

    42 -	uninstall-toolexeclibLTLIBRARIES

    43 +	uninstall-toolexeclibLTLIBRARIES install-exec-local

    44  

    45  

    46  # Symbol versioning for shared libraries.

    47 @@ -811,6 +811,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