Wed Sep 18 06:46:13 2019 UTC ()
mk/compiler/gcc.mk: add missing variables to _VARGROUPS section


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

--- pkgsrc/mk/compiler/gcc.mk 2019/09/18 06:35:12 1.206
+++ pkgsrc/mk/compiler/gcc.mk 2019/09/18 06:46:13 1.207
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.206 2019/09/18 06:35:12 rillig Exp $ 1# $NetBSD: gcc.mk,v 1.207 2019/09/18 06:46:13 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#
@@ -64,28 +64,28 @@ _USER_VARS.gcc= \ @@ -64,28 +64,28 @@ _USER_VARS.gcc= \
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 PKGSRC_USE_FORTIFY PKGSRC_USE_RELRO PKGSRC_USE_SSP \
66 COMPILER_USE_SYMLINKS CC 66 COMPILER_USE_SYMLINKS CC
67_PKG_VARS.gcc= \ 67_PKG_VARS.gcc= \
68 GCC_REQD USE_GCC_RUNTIME USE_LANGUAGES 68 GCC_REQD USE_GCC_RUNTIME USE_LANGUAGES
69_SYS_VARS.gcc= \ 69_SYS_VARS.gcc= \
70 CC_VERSION CC_VERSION_STRING LANGUAGES.gcc \ 70 CC_VERSION CC_VERSION_STRING LANGUAGES.gcc \
71 CCPATH CPPPATH CXXPATH F77PATH FCPATH \ 71 CCPATH CPPPATH CXXPATH F77PATH FCPATH \
72 PKG_CC PKG_CPP PKG_CXX PKG_FC FC PKGSRC_FORTRAN \ 72 PKG_CC PKG_CPP PKG_CXX PKG_FC FC PKGSRC_FORTRAN \
73 ADAPATH GMKPATH GLKPATH GBDPATH CHPPATH GLSPATH GNTPATH PRPPATH 73 ADAPATH GMKPATH GLKPATH GBDPATH CHPPATH GLSPATH GNTPATH PRPPATH
74_DEF_VARS.gcc= \ 74_DEF_VARS.gcc= \
75 MAKEFLAGS IMAKEOPTS \ 75 MAKEFLAGS IMAKEOPTS \
76 LDFLAGS \ 76 LDFLAGS \
77 PKG_ADA PKG_GMK PKG_GLK PKG_GBD PKG_CHP PKG_GNT PKG_PRP \ 77 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 PKG_SRCPRP \ 78 PKGSRC_ADA PKGSRC_GMK PKGSRC_GLK PKGSRC_GBD PKGSRC_CHP PKGSRC_GNT PKGSRC_GLS PKGSRC_PRP \
79 _CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \ 79 _CC _COMPILER_RPATH_FLAG _COMPILER_STRIP_VARS \
80 _GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CFLAGS \ 80 _GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CFLAGS \
81 _GCC_CC _GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \ 81 _GCC_CC _GCC_CPP _GCC_CXX _GCC_DEPENDENCY _GCC_DEPENDS \
82 _GCC_DIST_NAME _GCC_DIST_VERSION \ 82 _GCC_DIST_NAME _GCC_DIST_VERSION \
83 _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \ 83 _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \
84 _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \ 84 _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \
85 _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \ 85 _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \
86 _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \ 86 _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \
87 _GCC_VERSION_STRING \ 87 _GCC_VERSION_STRING \
88 _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GBD _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \ 88 _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 \ 89 _IGNORE_GCC _IGNORE_GCC3CXX _IGNORE_GCC3F77 _IGNORE_GCC3OBJC \
90 _IS_BUILTIN_GCC \ 90 _IS_BUILTIN_GCC \
91 _LANGUAGES.gcc \ 91 _LANGUAGES.gcc \
@@ -94,47 +94,51 @@ _DEF_VARS.gcc= \ @@ -94,47 +94,51 @@ _DEF_VARS.gcc= \
94 _NEED_GCC48 _NEED_GCC49 _NEED_GCC5 _NEED_GCC6 \ 94 _NEED_GCC48 _NEED_GCC49 _NEED_GCC5 _NEED_GCC6 \
95 _NEED_GCC7 _NEED_GCC8 _NEED_GCC_AUX _NEED_NEWER_GCC \ 95 _NEED_GCC7 _NEED_GCC8 _NEED_GCC_AUX _NEED_NEWER_GCC \
96 _PKGSRC_GCC_VERSION \ 96 _PKGSRC_GCC_VERSION \
97 _USE_GCC_SHLIB _USE_PKGSRC_GCC \ 97 _USE_GCC_SHLIB _USE_PKGSRC_GCC \
98 _WRAP_EXTRA_ARGS.CC CWRAPPERS_APPEND.cc CWRAPPERS_APPEND.cxx \ 98 _WRAP_EXTRA_ARGS.CC CWRAPPERS_APPEND.cc CWRAPPERS_APPEND.cxx \
99 _EXTRA_CC_DIRS \ 99 _EXTRA_CC_DIRS \
100 _CXX_STD_VERSIONS \ 100 _CXX_STD_VERSIONS \
101 ${_CXX_STD_VERSIONS:@std@_CXX_STD_FLAG.${std}@} \ 101 ${_CXX_STD_VERSIONS:@std@_CXX_STD_FLAG.${std}@} \
102 _MKPIE_CFLAGS.gcc _MKPIE_LDFLAGS.gcc \ 102 _MKPIE_CFLAGS.gcc _MKPIE_LDFLAGS.gcc \
103 _FORTIFY_CFLAGS _RELRO_LDFLAGS _STACK_CHECK_CFLAGS \ 103 _FORTIFY_CFLAGS _RELRO_LDFLAGS _STACK_CHECK_CFLAGS \
104 _CTF_CFLAGS CFLAGS \ 104 _CTF_CFLAGS CFLAGS \
105 _GCC_DIR \ 105 _GCC_DIR \
106 _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \ 106 _ALIASES.CC _ALIASES.CPP _ALIASES.CXX _ALIASES.FC \
 107 _ALIASES.ADA _ALIASES.GMK _ALIASES.GLK _ALIASES.GBD \
 108 _ALIASES.CHP _ALIASES.PRP _ALIASES.GLS _ALIASES.GNT \
107 _COMPILER_ABI_FLAG.32 _COMPILER_ABI_FLAG.64 \ 109 _COMPILER_ABI_FLAG.32 _COMPILER_ABI_FLAG.64 \
108 _COMPILER_ABI_FLAG.n32 _COMPILER_ABI_FLAG.o32 \ 110 _COMPILER_ABI_FLAG.n32 _COMPILER_ABI_FLAG.o32 \
109 _SSP_CFLAGS \ 111 _SSP_CFLAGS \
110 PREPEND_PATH \ 112 PREPEND_PATH \
111 COMPILER_INCLUDE_DIRS COMPILER_LIB_DIRS 113 COMPILER_INCLUDE_DIRS COMPILER_LIB_DIRS \
 114 CWRAPPERS_APPEND.ld \
 115 _CXX_STD_FLAG.c++03 _CXX_STD_FLAG.gnu++03
112_USE_VARS.gcc= \ 116_USE_VARS.gcc= \
113 MACHINE_ARCH PATH DRAGONFLY_CCVER OPSYS LOCALBASE \ 117 MACHINE_ARCH PATH DRAGONFLY_CCVER OPSYS LOCALBASE \
114 _PKGSRC_MKPIE _PKGSRC_MKREPRO _MKREPRO_CFLAGS.gcc \ 118 _PKGSRC_MKPIE _PKGSRC_MKREPRO _MKREPRO_CFLAGS.gcc \
115 USE_LIBTOOL \ 119 USE_LIBTOOL \
116 LIBABISUFFIX \ 120 LIBABISUFFIX \
117 COMPILER_RPATH_FLAG \ 121 COMPILER_RPATH_FLAG \
118 _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \ 122 _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \
119 MACHINE_GNU_PLATFORM \ 123 MACHINE_GNU_PLATFORM \
120 _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS \ 124 _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS \
121 WRKDIR MACHINE_PLATFORM PKGPATH 125 WRKDIR MACHINE_PLATFORM PKGPATH
122_IGN_VARS.gcc= \ 126_IGN_VARS.gcc= \
123 _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS _GCC44_PATTERNS \ 127 _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS _GCC44_PATTERNS \
124 _GCC48_PATTERNS _GCC49_PATTERNS _GCC5_PATTERNS _GCC6_PATTERNS \ 128 _GCC48_PATTERNS _GCC49_PATTERNS _GCC5_PATTERNS _GCC6_PATTERNS \
125 _GCC7_PATTERNS _GCC8_PATTERNS _GCC_AUX_PATTERNS 129 _GCC7_PATTERNS _GCC8_PATTERNS _GCC_AUX_PATTERNS
126_LISTED_VARS.gcc= \ 130_LISTED_VARS.gcc= \
127 MAKEFLAGS IMAKEOPTS LDFLAGS 131 MAKEFLAGS IMAKEOPTS LDFLAGS PREPEND_PATH
128.include "../../mk/bsd.prefs.mk" 132.include "../../mk/bsd.prefs.mk"
129 133
130USE_NATIVE_GCC?= no 134USE_NATIVE_GCC?= no
131USE_PKGSRC_GCC?= no 135USE_PKGSRC_GCC?= no
132USE_PKGSRC_GCC_RUNTIME?=no 136USE_PKGSRC_GCC_RUNTIME?=no
133 137
134GCC_REQD+= 2.8.0 138GCC_REQD+= 2.8.0
135 139
136# gcc2 doesn't support c99 and amd64 140# gcc2 doesn't support c99 and amd64
137.if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64" 141.if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64"
138GCC_REQD+= 3.0 142GCC_REQD+= 3.0
139.endif 143.endif
140 144