[src/trunk]: src/external/gpl3/gcc/lib catch up with GCC_SUBDIR changes for n...

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

details:   https://anonhg.NetBSD.org/src/rev/932269ff2de3
branches:  trunk
changeset: 796412:932269ff2de3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jun 01 20:24:45 2014 +0000

description:
catch up with GCC_SUBDIR changes for new-to-gcc 4.8 directories.

diffstat:

 external/gpl3/gcc/lib/libbacktrace/Makefile                 |   8 ++--
 external/gpl3/gcc/lib/liblto_plugin/Makefile                |  22 +++++++-----
 external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile      |   6 +-
 external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile |   6 +-
 external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile     |   6 +-
 5 files changed, 26 insertions(+), 22 deletions(-)

diffs (125 lines):

diff -r 4a970d92cb9b -r 932269ff2de3 external/gpl3/gcc/lib/libbacktrace/Makefile
--- a/external/gpl3/gcc/lib/libbacktrace/Makefile       Sun Jun 01 19:51:01 2014 +0000
+++ b/external/gpl3/gcc/lib/libbacktrace/Makefile       Sun Jun 01 20:24:45 2014 +0000
@@ -1,14 +1,14 @@
 #      $NetBSD
 
-DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GNUHOSTDIST=    ${DIST}
-
 LIBISPRIVATE=   yes
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=           backtrace
 
+DIST=          ${GCCDIST}
+GNUHOSTDIST=    ${DIST}
+
 SRCS=          dwarf.c elf.c fileline.c mmap.c mmapio.c nounwind.c \
                posix.c print.c state.c
                
diff -r 4a970d92cb9b -r 932269ff2de3 external/gpl3/gcc/lib/liblto_plugin/Makefile
--- a/external/gpl3/gcc/lib/liblto_plugin/Makefile      Sun Jun 01 19:51:01 2014 +0000
+++ b/external/gpl3/gcc/lib/liblto_plugin/Makefile      Sun Jun 01 20:24:45 2014 +0000
@@ -1,19 +1,21 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/01 10:00:42 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 .include <bsd.shlib.mk>
 
-NOLINT=                # defined
+LIB=           liblto_plugin
+
+DIST=          ${GCCDIST}
+GNUHOSTDIST=   ${DIST}
+
+SRCS=          lto-plugin.c
+
+CPPFLAGS+=     -DHAVE_CONFIG_H -I${DIST}/include -I.
 
 LIBISMODULE=   1
 USE_SHLIBDIR=  yes
 REQUIRETOOLS=  yes
-DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GNUHOSTDIST=   ${DIST}
-LIB=           liblto_plugin
-SRCS=          lto-plugin.c
-.PATH: ${DIST}/lto-plugin
-CPPFLAGS+=     -DHAVE_CONFIG_H -I${DIST}/include -I.
+NOLINT=                # defined
 
 # make this /usr/lib/gcc?
 LIBDIR=                /usr/libexec
@@ -45,6 +47,8 @@
 
 .include <bsd.lib.mk>
 
+.PATH: ${DIST}/lto-plugin
+
 .else
 .include <bsd.prog.mk> # do nothing
 .endif
diff -r 4a970d92cb9b -r 932269ff2de3 external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile    Sun Jun 01 19:51:01 2014 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile    Sun Jun 01 20:24:45 2014 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
 .include <bsd.init.mk>
 
 .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
-DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST=          ${GCCDIST}
+GNUHOSTDIST=   ${DIST}
 
 INCS=          ${G_pb_headers1} ${G_pb_headers2} ${G_pb_headers3} ${G_pb_headers4}
 INCS+=         ${G_pb_headers5} ${G_pb_headers6} ${G_pb_headers7}
diff -r 4a970d92cb9b -r 932269ff2de3 external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile       Sun Jun 01 19:51:01 2014 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile       Sun Jun 01 20:24:45 2014 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
 .include <bsd.init.mk>
 
 .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
-DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST=          ${GCCDIST}
+GNUHOSTDIST=   ${DIST}
 
 INCS=          ${G_profile_headers} ${G_profile_impl_headers}
 INCSDIR=       /usr/include/g++/profile
diff -r 4a970d92cb9b -r 932269ff2de3 external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile   Sun Jun 01 19:51:01 2014 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile   Sun Jun 01 20:24:45 2014 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/01 10:00:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
 
-.include <bsd.own.mk>
 .include <bsd.init.mk>
 
 .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
 
 .cc: # disable .cc->NULL transform
 
-DIST=          ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST=          ${GCCDIST}
+GNUHOSTDIST=   ${DIST}
 
 INCS=          ${G_tr2_headers}
 INCSDIR=       /usr/include/g++/tr2