patches/gcc/3.4.6/120-libstdc++-pic.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
parent 339 bd5e0a849352
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
yann@339
     1
diff -durN gcc-3.4.6.orig/libstdc++-v3/src/Makefile.am gcc-3.4.6/libstdc++-v3/src/Makefile.am
yann@339
     2
--- gcc-3.4.6.orig/libstdc++-v3/src/Makefile.am	2004-04-16 21:08:35.000000000 +0200
yann@339
     3
+++ gcc-3.4.6/libstdc++-v3/src/Makefile.am	2007-08-15 22:52:23.000000000 +0200
yann@339
     4
@@ -210,6 +210,10 @@
yann@339
     5
 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
yann@339
     6
 
yann@339
     7
 
yann@339
     8
+install-exec-local:
yann@339
     9
+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
yann@339
    10
+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
yann@339
    11
+
yann@339
    12
 # Added bits to build debug library.
yann@339
    13
 if GLIBCXX_BUILD_DEBUG
yann@339
    14
 all-local: build_debug
yann@339
    15
diff -durN gcc-3.4.6.orig/libstdc++-v3/src/Makefile.in gcc-3.4.6/libstdc++-v3/src/Makefile.in
yann@339
    16
--- gcc-3.4.6.orig/libstdc++-v3/src/Makefile.in	2004-04-16 21:08:35.000000000 +0200
yann@339
    17
+++ gcc-3.4.6/libstdc++-v3/src/Makefile.in	2007-08-15 22:52:23.000000000 +0200
yann@339
    18
@@ -592,7 +592,7 @@
yann@339
    19
 
yann@339
    20
 install-data-am: install-data-local
yann@339
    21
 
yann@339
    22
-install-exec-am: install-toolexeclibLTLIBRARIES
yann@339
    23
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
yann@339
    24
 
yann@339
    25
 install-info: install-info-am
yann@339
    26
 
yann@339
    27
@@ -625,6 +625,7 @@
yann@339
    28
 	distclean-tags distdir dvi dvi-am info info-am install \
yann@339
    29
 	install-am install-data install-data-am install-data-local \
yann@339
    30
 	install-exec install-exec-am install-info install-info-am \
yann@339
    31
+	install-exec-local \
yann@339
    32
 	install-man install-strip install-toolexeclibLTLIBRARIES \
yann@339
    33
 	installcheck installcheck-am installdirs maintainer-clean \
yann@339
    34
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
yann@339
    35
@@ -709,6 +710,11 @@
yann@339
    36
 install_debug:
yann@339
    37
 	(cd ${debugdir} && $(MAKE) \
yann@339
    38
 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
yann@339
    39
+
yann@339
    40
+install-exec-local:
yann@339
    41
+	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
yann@339
    42
+	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
yann@339
    43
+
yann@339
    44
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
yann@339
    45
 # Otherwise a system limit (for SysV at least) may be exceeded.
yann@339
    46
 .NOEXPORT: