patches/gcc/4.2.0/160-libstdc++-pic.patch
author Oron Peled <oron@actcom.co.il>
Mon Aug 03 23:11:53 2009 +0200 (2009-08-03)
branch1.4
changeset 1455 e6a3b4ffe576
parent 111 2e16b9fc302d
permissions -rw-r--r--
[configure] Fix automake version check

The configure script fails on automake-1.11 (in Fedora-11) since
it looks for 3-digit version number.

"Yann E. MORIN", added the following comment:

The check for the automake version is not against a 3-digit number,
but really against a 3-part version number, a-la 'x.y.z'. Versions
such as 1.10 and 1.11 are also valid.
yann@111
     1
# DP: Build and install libstdc++_pic.a library.
yann@111
     2
yann@111
     3
--- gcc/libstdc++-v3/src/Makefile.am
yann@111
     4
+++ gcc/libstdc++-v3/src/Makefile.am
yann@111
     5
@@ -214,6 +214,12 @@
yann@111
     6
 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
yann@111
     7
 
yann@111
     8
 
yann@111
     9
+install-exec-local:
yann@111
    10
+ifeq ($(enable_shared),yes)
yann@111
    11
+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
yann@111
    12
+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
yann@111
    13
+endif
yann@111
    14
+
yann@111
    15
 # Added bits to build debug library.
yann@111
    16
 if GLIBCXX_BUILD_DEBUG
yann@111
    17
 all-local: build_debug
yann@111
    18
--- gcc/libstdc++-v3/src/Makefile.in
yann@111
    19
+++ gcc/libstdc++-v3/src/Makefile.in
yann@111
    20
@@ -627,7 +627,7 @@
yann@111
    21
 
yann@111
    22
 install-data-am: install-data-local
yann@111
    23
 
yann@111
    24
-install-exec-am: install-toolexeclibLTLIBRARIES
yann@111
    25
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
yann@111
    26
 
yann@111
    27
 install-info: install-info-am
yann@111
    28
 
yann@111
    29
@@ -660,6 +660,7 @@
yann@111
    30
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
yann@111
    31
 	html-am info info-am install install-am install-data \
yann@111
    32
 	install-data-am install-data-local install-exec \
yann@111
    33
+	install-exec-local \
yann@111
    34
 	install-exec-am install-info install-info-am install-man \
yann@111
    35
 	install-strip install-toolexeclibLTLIBRARIES installcheck \
yann@111
    36
 	installcheck-am installdirs maintainer-clean \
yann@111
    37
@@ -743,6 +743,13 @@
yann@111
    38
 install_debug:
yann@111
    39
 	(cd ${debugdir} && $(MAKE) \
yann@111
    40
 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
yann@111
    41
+
yann@111
    42
+install-exec-local:
yann@111
    43
+ifeq ($(enable_shared),yes)
yann@111
    44
+	$(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
yann@111
    45
+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
yann@111
    46
+endif
yann@111
    47
+
yann@111
    48
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
yann@111
    49
 # Otherwise a system limit (for SysV at least) may be exceeded.
yann@111
    50
 .NOEXPORT: