Module Name:    src
Committed By:   mrg
Date:           Sun Jun  1 20:24:45 UTC 2014

Modified Files:
        src/external/gpl3/gcc/lib/libbacktrace: Makefile
        src/external/gpl3/gcc/lib/liblto_plugin: Makefile
        src/external/gpl3/gcc/lib/libstdc++-v3/include/pb: Makefile
        src/external/gpl3/gcc/lib/libstdc++-v3/include/profile: Makefile
        src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libbacktrace/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/liblto_plugin/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/lib/libbacktrace/Makefile
diff -u src/external/gpl3/gcc/lib/libbacktrace/Makefile:1.1 src/external/gpl3/gcc/lib/libbacktrace/Makefile:1.2
--- src/external/gpl3/gcc/lib/libbacktrace/Makefile:1.1	Sat Mar  1 10:00:31 2014
+++ src/external/gpl3/gcc/lib/libbacktrace/Makefile	Sun Jun  1 20:24:45 2014
@@ -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
 		

Index: src/external/gpl3/gcc/lib/liblto_plugin/Makefile
diff -u src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.1 src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.2
--- src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.1	Sat Mar  1 10:00:42 2014
+++ src/external/gpl3/gcc/lib/liblto_plugin/Makefile	Sun Jun  1 20:24:45 2014
@@ -1,20 +1,22 @@
-#	$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
 
-LIBISMODULE=	1
-USE_SHLIBDIR=	yes
-REQUIRETOOLS=	yes
-DIST=		${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST=		${GCCDIST}
 GNUHOSTDIST=	${DIST}
-LIB=		liblto_plugin
+
 SRCS=		lto-plugin.c
-.PATH:	${DIST}/lto-plugin
+
 CPPFLAGS+=	-DHAVE_CONFIG_H -I${DIST}/include -I.
 
+LIBISMODULE=	1
+USE_SHLIBDIR=	yes
+REQUIRETOOLS=	yes
+NOLINT=		# defined
+
 # make this /usr/lib/gcc?
 LIBDIR=		/usr/libexec
 
@@ -45,6 +47,8 @@ config.h: Makefile
 
 .include <bsd.lib.mk>
 
+.PATH:	${DIST}/lto-plugin
+
 .else
 .include <bsd.prog.mk> # do nothing
 .endif

Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.1	Sat Mar  1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile	Sun Jun  1 20:24:45 2014
@@ -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}

Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.1	Sat Mar  1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile	Sun Jun  1 20:24:45 2014
@@ -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

Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.1	Sat Mar  1 10:00:48 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile	Sun Jun  1 20:24:45 2014
@@ -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

Reply via email to