CVS commit: pkgsrc/mk/compiler

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Sep  7 07:10:15 UTC 2019

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk/compiler/gcc.mk: update _VARGROUPS


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 pkgsrc/mk/compiler/gcc.mk

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

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.201 pkgsrc/mk/compiler/gcc.mk:1.202
--- pkgsrc/mk/compiler/gcc.mk:1.201     Mon Jul 15 16:06:19 2019
+++ pkgsrc/mk/compiler/gcc.mk   Sat Sep  7 07:10:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.201 2019/07/15 16:06:19 ryoon Exp $
+# $NetBSD: gcc.mk,v 1.202 2019/09/07 07:10:15 rillig Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -59,20 +59,28 @@
 COMPILER_GCC_MK=       defined
 
 _VARGROUPS+=   gcc
-_USER_VARS.gcc=        USE_NATIVE_GCC USE_PKGSRC_GCC
-_PKG_VARS.gcc= GCC_REQD
-_SYS_VARS.gcc= CC_VERSION CC_VERSION_STRING LANGUAGES.gcc
+_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
+_PKG_VARS.gcc= \
+       GCC_REQD USE_GCC_RUNTIME
+_SYS_VARS.gcc= \
+       CC_VERSION CC_VERSION_STRING LANGUAGES.gcc
 _DEF_VARS.gcc= \
        CCPATH CPPPATH CXXPATH \
        F77PATH FCPATH \
        ADAPATH GMKPATH GLKPATH GDBPATH CHPPATH GLSPATH GNTPATH PRPPATH \
-       IMAKEOPTS \
+       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 \
        _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 \
+       _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 \
@@ -86,7 +94,39 @@ _DEF_VARS.gcc=       \
        _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 _NEED_NEWER_GCC \
        _PKGSRC_GCC_VERSION \
        _USE_GCC_SHLIB _USE_PKGSRC_GCC \
-       _WRAP_EXTRA_ARGS.CC
+       _WRAP_EXTRA_ARGS.CC CWRAPPERS_APPEND.cc CWRAPPERS_APPEND.cxx \
+       _EXTRA_CC_DIRS \
+       _CXX_STD_VERSIONS \
+       ${_CXX_STD_VERSIONS:@std@_CXX_STD_FLAG.${std}@} \
+       _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 \
+       _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  \
+       LIBABISUFFIX \
+       COMPILER_RPATH_FLAG \
+       _PKGSRC_USE_RELRO \
+       MACHINE_GNU_PLATFORM \
+       _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS
+_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
 
 .include "../../mk/bsd.prefs.mk"