kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace all uses of GCC_DEFAULT_VERSION by GCC_DEFAULT, remove the

Browse source 
definition of the former from Mk/bsd.gcc.mk and add the latter --
still set to 4.6 -- to Mk/bsd.default-versions.mk.

Include Mk/bsd.default-versions.mk from Mk/bsd.gcc.mk to tie the
two together.
This commit is contained in:
Gerald Pfeifer 2014-02-24 22:15:32 +00:00
parent 44a098df42
commit fadcef2222
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=345903
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mk/bsd.default-versions.mk
View file

@ -18,6 +18,7 @@ ${_l:U}_DEFAULT= ${lang:C/.*=//g}
.endfor
APACHE_DEFAULT?= 2.2
GCC_DEFAULT?= 4.6
FPC_DEFAULT?= 2.6.2
LUA_DEFAULT?= 5.2
MYSQL_DEFAULT?= 5.5

13
Mk/bsd.gcc.mk
View file

@ -32,6 +32,8 @@
GCC_Include_MAINTAINER= gerald@FreeBSD.org
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
# All GCC versions supported by the ports framework. Keep them in
# ascending order and in sync with the table below.
GCCVERSIONS= 040200 040600 040700 040800 040900
@ -45,14 +47,13 @@ GCCVERSION_040700= 0 0 4.7
GCCVERSION_040800= 0 0 4.8
GCCVERSION_040900= 0 0 4.9
GCC_DEFAULT_VERSION= 4.6
GCC_DEFAULT_V= ${GCC_DEFAULT_VERSION:S/.//}
GCC_DEFAULT_V= ${GCC_DEFAULT:S/.//}
# No configurable parts below this. ####################################
#
.if defined(USE_GCC) && ${USE_GCC} == yes
USE_GCC= ${GCC_DEFAULT_VERSION}+
USE_GCC= ${GCC_DEFAULT}+
.endif
# Extract the fields from GCCVERSION_...
@ -131,8 +132,8 @@ _GCC_FOUND:= ${_GCCVERSION_${v}_V}
. if defined(_GCC_FOUND)
_USE_GCC:= ${_GCC_FOUND}
. elif ${_USE_GCC} < ${GCC_DEFAULT_VERSION}
_USE_GCC:= ${GCC_DEFAULT_VERSION}
. elif ${_USE_GCC} < ${GCC_DEFAULT}
_USE_GCC:= ${GCC_DEFAULT}
. endif
.endif # defined(_GCC_ORLATER)
@ -148,7 +149,7 @@ _USE_GCC:= ${GCC_DEFAULT_VERSION}
. if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc)
V:= ${_GCCVERSION_${v}_V:S/.//}
_GCC_PORT_DEPENDS:= gcc${V}
. if ${_USE_GCC} == ${GCC_DEFAULT_VERSION}
. if ${_USE_GCC} == ${GCC_DEFAULT}
_GCC_PORT:= gcc
. else
_GCC_PORT:= gcc${V}