patches/gcc/4.0.4/120-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 1 eeea35fbf182
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 --- gcc-4.0.0/libstdc++-v3/src/Makefile.am
     2 +++ gcc-4.0.0/libstdc++-v3/src/Makefile.am
     3 @@ -214,6 +214,10 @@
     4  	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
     5  
     6  
     7 +install-exec-local:
     8 +	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
     9 +	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
    10 +
    11  # Added bits to build debug library.
    12  if GLIBCXX_BUILD_DEBUG
    13  all-local: build_debug
    14 --- gcc-4.0.0/libstdc++-v3/src/Makefile.in
    15 +++ gcc-4.0.0/libstdc++-v3/src/Makefile.in
    16 @@ -625,7 +625,7 @@
    17  
    18  install-data-am: install-data-local
    19  
    20 -install-exec-am: install-toolexeclibLTLIBRARIES
    21 +install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
    22  
    23  install-info: install-info-am
    24  
    25 @@ -664,7 +664,7 @@
    26  	maintainer-clean-generic mostlyclean mostlyclean-compile \
    27  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    28  	tags uninstall uninstall-am uninstall-info-am \
    29 -	uninstall-toolexeclibLTLIBRARIES
    30 +	uninstall-toolexeclibLTLIBRARIES install-exec-local
    31  
    32  @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver:  ${glibcxx_srcdir}/$(SYMVER_MAP)
    33  @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
    34 @@ -743,6 +743,11 @@
    35  install_debug:
    36  	(cd ${debugdir} && $(MAKE) \
    37  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
    38 +
    39 +install-exec-local:
    40 +	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
    41 +	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
    42 +
    43  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    44  # Otherwise a system limit (for SysV at least) may be exceeded.
    45  .NOEXPORT: