Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.4/240-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 1948 d341be24dc68
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 diff -durN gcc-4.4.4.orig/libstdc++-v3/src/Makefile.am gcc-4.4.4/libstdc++-v3/src/Makefile.am

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

     3 +++ gcc-4.4.4/libstdc++-v3/src/Makefile.am	2010-05-16 19:13:50.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.4.orig/libstdc++-v3/src/Makefile.in gcc-4.4.4/libstdc++-v3/src/Makefile.in

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

    20 +++ gcc-4.4.4/libstdc++-v3/src/Makefile.in	2010-05-16 19:13:50.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