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