[src/trunk]: src/external/gpl3/gcc/lib/libstdc++-v3/include adjustments for G...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/20b8a252e146
branches:  trunk
changeset: 766565:20b8a252e146
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jun 28 04:07:36 2011 +0000

description:
adjustments for GCC 4.5 src include path changes.

diffstat:

 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile      |  19 +++++----------
 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile |   4 ++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diffs (59 lines):

diff -r 9b1ec1dff779 -r 20b8a252e146 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Tue Jun 28 04:07:04 2011 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Tue Jun 28 04:07:36 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/06/28 04:07:36 mrg Exp $
 
 SUBDIR=                backward ext bits debug tr1
 #SUBDIR+=      pb_assoc
@@ -10,24 +10,19 @@
 .cc: # disable .cc->NULL transform
 
 DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+GNUHOSTDIST=   ${DIST}
 
 INCS=          exception new typeinfo cxxabi.h exception_defines.h
-INCS+=         ${G_std_headers_rename} ${G_c_base_headers_rename}
+INCS+=         cerrno
+INCS+=         ${G_std_headers} ${G_c_base_headers}
 INCS+=         ${G_c_compatibility_headers_extra}
 INCSDIR=       /usr/include/g++
 
-${G_std_headers_rename}: ${.CURDIR}/Makefile
-       cp ${DIST}/libstdc++-v3/include/std/std_${.TARGET}.h ${.TARGET}
-
-CLEANFILES+=   ${G_std_headers_rename} ${G_c_base_headers_rename}
-
 .PATH: ${DIST}/libstdc++-v3 ${DIST}/libstdc++-v3/libsupc++
+.PATH: ${DIST}/libstdc++-v3/include/c_compatibility
+.PATH: ${DIST}/libstdc++-v3/include/c_global
+.PATH: ${DIST}/libstdc++-v3/include/std
 
 # Get default targets including <bsd.inc.mk>.
 .include <bsd.prog.mk>
 .include <bsd.subdir.mk>
-
-${G_c_base_headers_rename}: ${.CURDIR}/Makefile
-       cp ${DIST}/libstdc++-v3/include/c_std/std_${.TARGET}.h ${.TARGET}
-
-
diff -r 9b1ec1dff779 -r 20b8a252e146 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Tue Jun 28 04:07:04 2011 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Tue Jun 28 04:07:36 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2011/06/28 04:07:36 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -34,7 +34,9 @@
 
 .PATH: ${DIST}/libstdc++-v3/include/bits \
        ${DIST}/libstdc++-v3/include/c_std \
+       ${DIST}/libstdc++-v3/include/precompiled \
        ${CONF}/os/bsd/netbsd \
+       ${CONF}/os/generic \
        ${CONF}/io \
        ${CONF}/cpu/${BITS_CPUDIR} \
        ${CONF}/cpu/generic \