Thu Sep 19 06:46:59 2019 UTC ()
mk/compiler/gcc.mk: reorder variables in _VARGROUPS section

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


(rillig)
diff -r1.207 -r1.208 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.207 -r1.208 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2019/09/18 06:46:13 1.207
+++ pkgsrc/mk/compiler/gcc.mk 2019/09/19 06:46:59 1.208
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.207 2019/09/18 06:46:13 rillig Exp $ 1# $NetBSD: gcc.mk,v 1.208 2019/09/19 06:46:59 rillig Exp $
2# 2#
3# This is the compiler definition for the GNU Compiler Collection. 3# This is the compiler definition for the GNU Compiler Collection.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# GCCBASE 7# GCCBASE
8# If using a native GCC and the compiler is not in $PATH then 8# If using a native GCC and the compiler is not in $PATH then
9# this should be set to the base installation directory. 9# this should be set to the base installation directory.
10# 10#
11# USE_NATIVE_GCC 11# USE_NATIVE_GCC
12# When set to "yes", the native gcc is used, no matter which 12# When set to "yes", the native gcc is used, no matter which
13# compiler version a package requires. 13# compiler version a package requires.
14# 14#
@@ -52,87 +52,88 @@ @@ -52,87 +52,88 @@
52# The same(?) as CC_VERSION. FIXME: What's the difference between 52# The same(?) as CC_VERSION. FIXME: What's the difference between
53# the two? 53# the two?
54# 54#
55# Keywords: gcc 55# Keywords: gcc
56# 56#
57 57
58.if !defined(COMPILER_GCC_MK) 58.if !defined(COMPILER_GCC_MK)
59COMPILER_GCC_MK= defined 59COMPILER_GCC_MK= defined
60 60
61_VARGROUPS+= gcc 61_VARGROUPS+= gcc
62_USER_VARS.gcc= \ 62_USER_VARS.gcc= \
63 USE_NATIVE_GCC USE_PKGSRC_GCC USE_PKGSRC_GCC_RUNTIME \ 63 USE_NATIVE_GCC USE_PKGSRC_GCC USE_PKGSRC_GCC_RUNTIME \
64 GCCBASE GCC_VERSION_SUFFIX \ 64 GCCBASE GCC_VERSION_SUFFIX \
65 USE_CROSS_COMPILE PKGSRC_USE_FORTIFY PKGSRC_USE_RELRO PKGSRC_USE_SSP \ 65 USE_CROSS_COMPILE \
 66 PKGSRC_USE_FORTIFY PKGSRC_USE_RELRO PKGSRC_USE_SSP \
66 COMPILER_USE_SYMLINKS CC 67 COMPILER_USE_SYMLINKS CC
67_PKG_VARS.gcc= \ 68_PKG_VARS.gcc= \
68 GCC_REQD USE_GCC_RUNTIME USE_LANGUAGES 69 GCC_REQD USE_GCC_RUNTIME USE_LANGUAGES
69_SYS_VARS.gcc= \ 70_SYS_VARS.gcc= \
70 CC_VERSION CC_VERSION_STRING LANGUAGES.gcc \ 71 CC_VERSION CC_VERSION_STRING LANGUAGES.gcc \
71 CCPATH CPPPATH CXXPATH F77PATH FCPATH \ 72 CCPATH CPPPATH CXXPATH F77PATH FCPATH \
72 PKG_CC PKG_CPP PKG_CXX PKG_FC FC PKGSRC_FORTRAN \ 73 PKG_CC PKG_CPP PKG_CXX PKG_FC FC PKGSRC_FORTRAN \
73 ADAPATH GMKPATH GLKPATH GBDPATH CHPPATH GLSPATH GNTPATH PRPPATH 74 ADAPATH GMKPATH GLKPATH GBDPATH CHPPATH GLSPATH GNTPATH PRPPATH
74_DEF_VARS.gcc= \ 75_DEF_VARS.gcc= \
75 MAKEFLAGS IMAKEOPTS \ 76 MAKEFLAGS IMAKEOPTS \
76 LDFLAGS \ 77 CFLAGS LDFLAGS \
 78 PREPEND_PATH \
 79 COMPILER_INCLUDE_DIRS COMPILER_LIB_DIRS \
 80 CWRAPPERS_APPEND.cc CWRAPPERS_APPEND.cxx CWRAPPERS_APPEND.ld \
77 PKG_ADA PKG_GMK PKG_GLK PKG_GBD PKG_CHP PKG_GNT PKG_GLS PKG_PRP \ 81 PKG_ADA PKG_GMK PKG_GLK PKG_GBD PKG_CHP PKG_GNT PKG_GLS PKG_PRP \
78 PKGSRC_ADA PKGSRC_GMK PKGSRC_GLK PKGSRC_GBD PKGSRC_CHP PKGSRC_GNT PKGSRC_GLS PKGSRC_PRP \ 82 PKGSRC_ADA PKGSRC_GMK PKGSRC_GLK PKGSRC_GBD PKGSRC_CHP PKGSRC_GNT PKGSRC_GLS PKGSRC_PRP \
79 _CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \ 83 _CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \
80 _GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CFLAGS \ 84 _GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CFLAGS \
81 _GCC_CC _GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \ 85 _GCC_CC _GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \
82 _GCC_DIST_NAME _GCC_DIST_VERSION \ 86 _GCC_DIST_NAME _GCC_DIST_VERSION \
83 _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \ 87 _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \
84 _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \ 88 _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \
85 _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \ 89 _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \
86 _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \ 90 _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \
87 _GCC_VERSION_STRING \ 91 _GCC_VERSION_STRING \
88 _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GBD _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \ 92 _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GBD _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \
89 _IGNORE_GCC _IGNORE_GCC3CXX _IGNORE_GCC3F77 _IGNORE_GCC3OBJC \ 93 _IGNORE_GCC _IGNORE_GCC3CXX _IGNORE_GCC3F77 _IGNORE_GCC3OBJC \
90 _IS_BUILTIN_GCC \ 94 _IS_BUILTIN_GCC \
91 _LANGUAGES.gcc \ 95 _LANGUAGES.gcc \
92 _LINKER_RPATH_FLAG \ 96 _LINKER_RPATH_FLAG \
93 _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 \ 97 _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 \
94 _NEED_GCC48 _NEED_GCC49 _NEED_GCC5 _NEED_GCC6 \ 98 _NEED_GCC48 _NEED_GCC49 _NEED_GCC5 _NEED_GCC6 \
95 _NEED_GCC7 _NEED_GCC8 _NEED_GCC_AUX _NEED_NEWER_GCC \ 99 _NEED_GCC7 _NEED_GCC8 _NEED_GCC_AUX _NEED_NEWER_GCC \
96 _PKGSRC_GCC_VERSION \ 100 _PKGSRC_GCC_VERSION \
97 _USE_GCC_SHLIB _USE_PKGSRC_GCC \ 101 _USE_GCC_SHLIB _USE_PKGSRC_GCC \
98 _WRAP_EXTRA_ARGS.CC CWRAPPERS_APPEND.cc CWRAPPERS_APPEND.cxx \ 102 _WRAP_EXTRA_ARGS.CC \
99 _EXTRA_CC_DIRS \ 103 _EXTRA_CC_DIRS \
100 _CXX_STD_VERSIONS \ 104 _CXX_STD_VERSIONS \
101 ${_CXX_STD_VERSIONS:@std@_CXX_STD_FLAG.${std}@} \ 105 ${_CXX_STD_VERSIONS:@std@_CXX_STD_FLAG.${std}@} \
102 _MKPIE_CFLAGS.gcc _MKPIE_LDFLAGS.gcc \ 106 _MKPIE_CFLAGS.gcc _MKPIE_LDFLAGS.gcc \
103 _FORTIFY_CFLAGS _RELRO_LDFLAGS _STACK_CHECK_CFLAGS \ 107 _FORTIFY_CFLAGS _RELRO_LDFLAGS _STACK_CHECK_CFLAGS \
104 _CTF_CFLAGS CFLAGS \ 108 _CTF_CFLAGS \
105 _GCC_DIR \ 109 _GCC_DIR \
106 _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \ 110 _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \
107 _ALIASES.ADA _ALIASES.GMK _ALIASES.GLK _ALIASES.GBD \ 111 _ALIASES.ADA _ALIASES.GMK _ALIASES.GLK _ALIASES.GBD \
108 _ALIASES.CHP _ALIASES.PRP _ALIASES.GLS _ALIASES.GNT \ 112 _ALIASES.CHP _ALIASES.PRP _ALIASES.GLS _ALIASES.GNT \
109 _COMPILER_ABI_FLAG.32 _COMPILER_ABI_FLAG.64 \ 113 _COMPILER_ABI_FLAG.32 _COMPILER_ABI_FLAG.64 \
110 _COMPILER_ABI_FLAG.n32 _COMPILER_ABI_FLAG.o32 \ 114 _COMPILER_ABI_FLAG.n32 _COMPILER_ABI_FLAG.o32 \
111 _SSP_CFLAGS \ 115 _SSP_CFLAGS \
112 PREPEND_PATH \ 
113 COMPILER_INCLUDE_DIRS COMPILER_LIB_DIRS \ 
114 CWRAPPERS_APPEND.ld \ 
115 _CXX_STD_FLAG.c++03 _CXX_STD_FLAG.gnu++03 116 _CXX_STD_FLAG.c++03 _CXX_STD_FLAG.gnu++03
116_USE_VARS.gcc= \ 117_USE_VARS.gcc= \
117 MACHINE_ARCH PATH DRAGONFLY_CCVER OPSYS LOCALBASE \ 118 MACHINE_ARCH PATH DRAGONFLY_CCVER OPSYS LOCALBASE \
118 _PKGSRC_MKPIE _PKGSRC_MKREPRO _MKREPRO_CFLAGS.gcc \ 
119 USE_LIBTOOL \ 119 USE_LIBTOOL \
120 LIBABISUFFIX \ 120 LIBABISUFFIX \
121 COMPILER_RPATH_FLAG \ 121 COMPILER_RPATH_FLAG \
122 _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \ 
123 MACHINE_GNU_PLATFORM \ 122 MACHINE_GNU_PLATFORM \
124 _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS \ 123 WRKDIR MACHINE_PLATFORM PKGPATH \
125 WRKDIR MACHINE_PLATFORM PKGPATH 124 _PKGSRC_MKPIE _PKGSRC_MKREPRO _MKREPRO_CFLAGS.gcc \
 125 _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \
 126 _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS
126_IGN_VARS.gcc= \ 127_IGN_VARS.gcc= \
127 _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS _GCC44_PATTERNS \ 128 _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS _GCC44_PATTERNS \
128 _GCC48_PATTERNS _GCC49_PATTERNS _GCC5_PATTERNS _GCC6_PATTERNS \ 129 _GCC48_PATTERNS _GCC49_PATTERNS _GCC5_PATTERNS _GCC6_PATTERNS \
129 _GCC7_PATTERNS _GCC8_PATTERNS _GCC_AUX_PATTERNS 130 _GCC7_PATTERNS _GCC8_PATTERNS _GCC_AUX_PATTERNS
130_LISTED_VARS.gcc= \ 131_LISTED_VARS.gcc= \
131 MAKEFLAGS IMAKEOPTS LDFLAGS PREPEND_PATH 132 MAKEFLAGS IMAKEOPTS LDFLAGS PREPEND_PATH
132.include "../../mk/bsd.prefs.mk" 133.include "../../mk/bsd.prefs.mk"
133 134
134USE_NATIVE_GCC?= no 135USE_NATIVE_GCC?= no
135USE_PKGSRC_GCC?= no 136USE_PKGSRC_GCC?= no
136USE_PKGSRC_GCC_RUNTIME?=no 137USE_PKGSRC_GCC_RUNTIME?=no
137 138
138GCC_REQD+= 2.8.0 139GCC_REQD+= 2.8.0