patches/gcc/3.4.6/170-sdk-libstdc++-includes.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/fragment.am gcc-3.4.6/libstdc++-v3/fragment.am
yann@339
     2
--- gcc-3.4.6.orig/libstdc++-v3/fragment.am	2003-08-27 02:38:28.000000000 +0200
yann@339
     3
+++ gcc-3.4.6/libstdc++-v3/fragment.am	2007-08-15 22:59:09.000000000 +0200
yann@339
     4
@@ -18,7 +18,7 @@
yann@339
     5
 	$(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once
yann@339
     6
 
yann@339
     7
 # -I/-D flags to pass when compiling.
yann@339
     8
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
yann@339
     9
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include
yann@339
    10
 
yann@339
    11
 
yann@339
    12
 
yann@339
    13
diff -durN gcc-3.4.6.orig/libstdc++-v3/libmath/Makefile.am gcc-3.4.6/libstdc++-v3/libmath/Makefile.am
yann@339
    14
--- gcc-3.4.6.orig/libstdc++-v3/libmath/Makefile.am	2003-08-27 23:29:43.000000000 +0200
yann@339
    15
+++ gcc-3.4.6/libstdc++-v3/libmath/Makefile.am	2007-08-15 22:59:09.000000000 +0200
yann@339
    16
@@ -32,7 +32,7 @@
yann@339
    17
 
yann@339
    18
 libmath_la_SOURCES = stubs.c
yann@339
    19
 
yann@339
    20
-AM_CPPFLAGS = $(CANADIAN_INCLUDES)
yann@339
    21
+AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include
yann@339
    22
 
yann@339
    23
 # Only compiling "C" sources in this directory.
yann@339
    24
 LIBTOOL = @LIBTOOL@ --tag CC