[pkgsrc/trunk]: pkgsrc/mk/compiler mk/compiler/gcc.mk: improve _VARGROUPS sec...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e924eff76eb8
branches:  trunk
changeset: 400943:e924eff76eb8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Sep 07 22:20:32 2019 +0000

description:
mk/compiler/gcc.mk: improve _VARGROUPS section

diffstat:

 mk/compiler/gcc.mk |  51 ++++++++++++++++++++++++---------------------------
 1 files changed, 24 insertions(+), 27 deletions(-)

diffs (103 lines):

diff -r 38f8ce627447 -r e924eff76eb8 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Sat Sep 07 21:18:50 2019 +0000
+++ b/mk/compiler/gcc.mk        Sat Sep 07 22:20:32 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.202 2019/09/07 07:10:15 rillig Exp $
+# $NetBSD: gcc.mk,v 1.203 2019/09/07 22:20:32 rillig Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -62,36 +62,37 @@
 _USER_VARS.gcc=        \
        USE_NATIVE_GCC USE_PKGSRC_GCC USE_PKGSRC_GCC_RUNTIME \
        GCCBASE GCC_VERSION_SUFFIX \
-       USE_CROSS_COMPILE PKGSRC_USE_RELRO PKGSRC_USE_SSP \
-       COMPILER_USE_SYMLINKS
+       USE_CROSS_COMPILE PKGSRC_USE_FORTIFY PKGSRC_USE_RELRO PKGSRC_USE_SSP \
+       COMPILER_USE_SYMLINKS CC
 _PKG_VARS.gcc= \
-       GCC_REQD USE_GCC_RUNTIME
+       GCC_REQD USE_GCC_RUNTIME USE_LANGUAGES
 _SYS_VARS.gcc= \
-       CC_VERSION CC_VERSION_STRING LANGUAGES.gcc
+       CC_VERSION CC_VERSION_STRING LANGUAGES.gcc \
+       CCPATH CPPPATH CXXPATH F77PATH FCPATH \
+       PKG_CC PKG_CPP PKG_CXX PKG_FC FC PKGSRC_FORTRAN \
+       ADAPATH GMKPATH GLKPATH GBDPATH CHPPATH GLSPATH GNTPATH PRPPATH
 _DEF_VARS.gcc= \
-       CCPATH CPPPATH CXXPATH \
-       F77PATH FCPATH \
-       ADAPATH GMKPATH GLKPATH GDBPATH CHPPATH GLSPATH GNTPATH PRPPATH \
        MAKEFLAGS IMAKEOPTS \
        LDFLAGS \
-       PKG_CC PKG_CPP PKG_CXX PKG_FC \
-       PKG_ADA PKG_GMK PKG_GLK PKG_GDB PKG_CHP PKG_GLK PKG_GNT PKG_PRP \
-       PKGSRC_ADA PKGSRC_GMK PKGSRC_GLK PKGSRC_GDB PKGSRC_CHP PKGSRC_GLK PKGSRC_GNT PKG_SRCPRP \
+       PKG_ADA PKG_GMK PKG_GLK PKG_GBD PKG_CHP PKG_GNT PKG_PRP \
+       PKGSRC_ADA PKGSRC_GMK PKGSRC_GLK PKGSRC_GBD PKGSRC_CHP PKGSRC_GNT PKG_SRCPRP \
        _CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \
-       _GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CC _GCC_CFLAGS \
-       _GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \
+       _GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CFLAGS \
+       _GCC_CC _GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \
        _GCC_DIST_NAME _GCC_DIST_VERSION \
        _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \
        _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \
        _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \
        _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \
        _GCC_VERSION_STRING \
-       _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GDB _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \
+       _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GBD _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \
        _IGNORE_GCC _IGNORE_GCC3CXX _IGNORE_GCC3F77 _IGNORE_GCC3OBJC \
        _IS_BUILTIN_GCC \
        _LANGUAGES.gcc \
        _LINKER_RPATH_FLAG \
-       _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 _NEED_NEWER_GCC \
+       _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 \
+       _NEED_GCC48 _NEED_GCC49 _NEED_GCC5 _NEED_GCC6 \
+       _NEED_GCC7 _NEED_GCC8 _NEED_GCC_AUX _NEED_NEWER_GCC \
        _PKGSRC_GCC_VERSION \
        _USE_GCC_SHLIB _USE_PKGSRC_GCC \
        _WRAP_EXTRA_ARGS.CC CWRAPPERS_APPEND.cc CWRAPPERS_APPEND.cxx \
@@ -101,33 +102,29 @@
        _MKPIE_CFLAGS.gcc _MKPIE_LDFLAGS.gcc \
        _FORTIFY_CFLAGS _RELRO_LDFLAGS _STACK_CHECK_CFLAGS \
        _CTF_CFLAGS CFLAGS \
-       _IGNORE_GCC MAKEFLAGS \
-       _GCC_DIR _GCC_VARS \
-       _ALIASES.CC _GCC_CC CCPATH PKG_CC \
-       _ALIASES.CPP _GCC_CPP CPPPATH PKG_CPP \
-       _ALIASES.CXX _GCC_CXX CXXPATH PKG_CXX \
-       _ALIASES.FC _GCC_FC FCPATH PKG_FC FC F77PATH PKGSRC_FORTRAN \
+       _GCC_DIR \
+       _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \
        _COMPILER_ABI_FLAG.32 _COMPILER_ABI_FLAG.64 \
        _COMPILER_ABI_FLAG.n32 _COMPILER_ABI_FLAG.o32 \
        _SSP_CFLAGS \
        PREPEND_PATH \
        COMPILER_INCLUDE_DIRS COMPILER_LIB_DIRS
-
 _USE_VARS.gcc= \
        MACHINE_ARCH PATH DRAGONFLY_CCVER OPSYS LOCALBASE \
        _PKGSRC_MKPIE _PKGSRC_MKREPRO _MKREPRO_CFLAGS.gcc \
-       _PKGSRC_USE_STACK_CHECK _STACK_CHECK_CFLAGS \
-       USE_LIBTOOL USE_GCC_RUNTIME  \
+       USE_LIBTOOL \
        LIBABISUFFIX \
        COMPILER_RPATH_FLAG \
-       _PKGSRC_USE_RELRO \
+       _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \
        MACHINE_GNU_PLATFORM \
-       _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS
+       _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS \
+       WRKDIR MACHINE_PLATFORM PKGPATH
 _IGN_VARS.gcc= \
        _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS _GCC44_PATTERNS \
        _GCC48_PATTERNS _GCC49_PATTERNS _GCC5_PATTERNS _GCC6_PATTERNS \
        _GCC7_PATTERNS _GCC8_PATTERNS _GCC_AUX_PATTERNS
-
+_LISTED_VARS.gcc= \
+       MAKEFLAGS IMAKEOPTS LDFLAGS
 .include "../../mk/bsd.prefs.mk"
 
 USE_NATIVE_GCC?=       no