[src/trunk]: src/external/gpl3 consolidate path for gcc-version specific into...

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

details:   https://anonhg.NetBSD.org/src/rev/e7265743a43e
branches:  trunk
changeset: 365371:e7265743a43e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Aug 12 21:48:56 2018 +0000

description:
consolidate path for gcc-version specific into GCC_INCSDIR, and
have it derived from the HAVE_GCC value so it does not need to
be modified for newer GCCs.

diffstat:

 external/gpl3/gcc.old/Makefile.gcc_path                  |  4 +++-
 external/gpl3/gcc.old/lib/libgomp/Makefile               |  4 ++--
 external/gpl3/gcc.old/usr.bin/include/Makefile           |  4 ++--
 external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile |  4 ++--
 external/gpl3/gcc/Makefile.gcc_path                      |  4 +++-
 external/gpl3/gcc/lib/libgomp/Makefile                   |  4 ++--
 external/gpl3/gcc/usr.bin/include/Makefile               |  4 ++--
 external/gpl3/gcc/usr.bin/include/sanitizer/Makefile     |  4 ++--
 8 files changed, 18 insertions(+), 14 deletions(-)

diffs (138 lines):

diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc.old/Makefile.gcc_path
--- a/external/gpl3/gcc.old/Makefile.gcc_path   Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc.old/Makefile.gcc_path   Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gcc_path,v 1.6 2017/07/23 01:10:50 mrg Exp $
+#      $NetBSD: Makefile.gcc_path,v 1.7 2018/08/12 21:48:57 mrg Exp $
 
 # Define some commom paths
 
@@ -13,4 +13,6 @@
 GCCDIST=       ${GCC_SUBDIR}/dist
 #.endif
 
+GCC_INCSDIR=   /usr/include/gcc-${HAVE_GCC}
+
 .endif # _GPL3_GCC_MAKEFILE_INC_
diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc.old/lib/libgomp/Makefile
--- a/external/gpl3/gcc.old/lib/libgomp/Makefile        Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc.old/lib/libgomp/Makefile        Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2018/08/02 00:03:42 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2018/08/12 21:48:57 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -79,7 +79,7 @@
 FILESDIR=      ${LIBDIR}
 
 INCS=          omp.h openacc.h
-INCSDIR=       /usr/include/gcc-6
+INCSDIR=       ${GCC_INCSDIR}
 .endif
 
 .else                  # } else {
diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc.old/usr.bin/include/Makefile
--- a/external/gpl3/gcc.old/usr.bin/include/Makefile    Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc.old/usr.bin/include/Makefile    Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2018/08/02 00:04:03 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2018/08/12 21:48:57 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -25,7 +25,7 @@
 CLEANFILES+=   mm_malloc.h
 .endif
 
-INCSDIR=       /usr/include/gcc-6
+INCSDIR=       ${GCC_INCSDIR}
 
 .include <bsd.subdir.mk>
 .include <bsd.prog.mk>
diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile
--- a/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile  Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile  Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2018/08/02 07:47:30 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2018/08/12 21:48:57 mrg Exp $
 
 .include "../../../Makefile.gcc_path"
 
@@ -19,6 +19,6 @@
 
 .include <bsd.own.mk>
 
-INCSDIR=       /usr/include/gcc-6/sanitizer
+INCSDIR=       ${GCC_INCSDIR}/sanitizer
 
 .include <bsd.prog.mk>
diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc/Makefile.gcc_path
--- a/external/gpl3/gcc/Makefile.gcc_path       Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc/Makefile.gcc_path       Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gcc_path,v 1.2 2014/06/14 20:49:36 mrg Exp $
+#      $NetBSD: Makefile.gcc_path,v 1.3 2018/08/12 21:48:56 mrg Exp $
 
 # Define some commom paths
 
@@ -13,4 +13,6 @@
 GCCDIST=       ${GCC_SUBDIR}/dist
 #.endif
 
+GCC_INCSDIR=   /usr/include/gcc-${HAVE_GCC}
+
 .endif # _GPL3_GCC_MAKEFILE_INC_
diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile    Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile    Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2018/02/03 21:27:45 mrg Exp $
+#      $NetBSD: Makefile,v 1.20 2018/08/12 21:48:57 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -79,7 +79,7 @@
 FILESDIR=      ${LIBDIR}
 
 INCS=          omp.h openacc.h
-INCSDIR=       /usr/include/gcc-6
+INCSDIR=       ${GCC_INCSDIR}
 .endif
 
 .else                  # } else {
diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc/usr.bin/include/Makefile
--- a/external/gpl3/gcc/usr.bin/include/Makefile        Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/include/Makefile        Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2018/02/11 02:12:29 christos Exp $
+#      $NetBSD: Makefile,v 1.13 2018/08/12 21:48:57 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -25,7 +25,7 @@
 CLEANFILES+=   mm_malloc.h
 .endif
 
-INCSDIR=       /usr/include/gcc-6
+INCSDIR=       ${GCC_INCSDIR}
 
 .include <bsd.subdir.mk>
 .include <bsd.prog.mk>
diff -r 740846801a2d -r e7265743a43e external/gpl3/gcc/usr.bin/include/sanitizer/Makefile
--- a/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile      Sun Aug 12 21:44:17 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile      Sun Aug 12 21:48:56 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2018/02/02 20:57:53 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2018/08/12 21:48:57 mrg Exp $
 
 .include "../../../Makefile.gcc_path"
 
@@ -19,6 +19,6 @@
 
 .include <bsd.own.mk>
 
-INCSDIR=       /usr/include/gcc-6/sanitizer
+INCSDIR=       ${GCC_INCSDIR}/sanitizer
 
 .include <bsd.prog.mk>