CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Sep 19 06:46:59 UTC 2019

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

Log Message:
mk/compiler/gcc.mk: reorder variables in _VARGROUPS section

By listing the public variables first, the focus is put on the most
important variables.


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 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.207 pkgsrc/mk/compiler/gcc.mk:1.208
--- pkgsrc/mk/compiler/gcc.mk:1.207     Wed Sep 18 06:46:13 2019
+++ pkgsrc/mk/compiler/gcc.mk   Thu Sep 19 06:46:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.207 2019/09/18 06:46:13 rillig Exp $
+# $NetBSD: gcc.mk,v 1.208 2019/09/19 06:46:59 rillig Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -62,7 +62,8 @@ _VARGROUPS+=  gcc
 _USER_VARS.gcc=        \
        USE_NATIVE_GCC USE_PKGSRC_GCC USE_PKGSRC_GCC_RUNTIME \
        GCCBASE GCC_VERSION_SUFFIX \
-       USE_CROSS_COMPILE PKGSRC_USE_FORTIFY PKGSRC_USE_RELRO PKGSRC_USE_SSP \
+       USE_CROSS_COMPILE \
+       PKGSRC_USE_FORTIFY PKGSRC_USE_RELRO PKGSRC_USE_SSP \
        COMPILER_USE_SYMLINKS CC
 _PKG_VARS.gcc= \
        GCC_REQD USE_GCC_RUNTIME USE_LANGUAGES
@@ -73,7 +74,10 @@ _SYS_VARS.gcc=       \
        ADAPATH GMKPATH GLKPATH GBDPATH CHPPATH GLSPATH GNTPATH PRPPATH
 _DEF_VARS.gcc= \
        MAKEFLAGS IMAKEOPTS \
-       LDFLAGS \
+       CFLAGS LDFLAGS \
+       PREPEND_PATH \
+       COMPILER_INCLUDE_DIRS COMPILER_LIB_DIRS \
+       CWRAPPERS_APPEND.cc CWRAPPERS_APPEND.cxx CWRAPPERS_APPEND.ld \
        PKG_ADA PKG_GMK PKG_GLK PKG_GBD PKG_CHP PKG_GNT PKG_GLS PKG_PRP \
        PKGSRC_ADA PKGSRC_GMK PKGSRC_GLK PKGSRC_GBD PKGSRC_CHP PKGSRC_GNT PKGSRC_GLS PKGSRC_PRP \
        _CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \
@@ -95,13 +99,13 @@ _DEF_VARS.gcc=      \
        _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 \
+       _WRAP_EXTRA_ARGS.CC \
        _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 \
+       _CTF_CFLAGS \
        _GCC_DIR \
        _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \
        _ALIASES.ADA _ALIASES.GMK _ALIASES.GLK _ALIASES.GBD \
@@ -109,20 +113,17 @@ _DEF_VARS.gcc=    \
        _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 \
-       CWRAPPERS_APPEND.ld \
        _CXX_STD_FLAG.c++03 _CXX_STD_FLAG.gnu++03
 _USE_VARS.gcc= \
        MACHINE_ARCH PATH DRAGONFLY_CCVER OPSYS LOCALBASE \
-       _PKGSRC_MKPIE _PKGSRC_MKREPRO _MKREPRO_CFLAGS.gcc \
        USE_LIBTOOL \
        LIBABISUFFIX \
        COMPILER_RPATH_FLAG \
-       _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \
        MACHINE_GNU_PLATFORM \
-       _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS \
-       WRKDIR MACHINE_PLATFORM PKGPATH
+       WRKDIR MACHINE_PLATFORM PKGPATH \
+       _PKGSRC_MKPIE _PKGSRC_MKREPRO _MKREPRO_CFLAGS.gcc \
+       _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \
+       _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 \