mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

As of today, USE_GCC=yes (and USE_GCC=any in most circumstances)

Browse Source 
and consequently many of the USES=compiler flavors use the canonical
version of GCC as defined in Mk/bsd.default-versions.mk as well as
the lang/gcc port

With the "new" setup starting with GCC 5 where I have introduced
lang/gcc5-devel for regular snapshots and lang/gcc5 for releases,
and similarly for GCC 6 and onward, we can now leverage lang/gcc5
(and later) for most of the role that lang/gcc used to play -- and
indeed as of today lang/gcc and lang/gcc5 are nearly identical
short of symlinks for gcc, g++, and gfortran binaries that the
former provides.

So now use lang/gcc5 instead of lang/gcc whenever requested via the
USE_GCC framework directly or indirectly.

This is similar to how the python ports work, for example, and it
allows simplifications in Mk/bsd.gcc.mk and Mk/Uses/fortran.mk and
dropping LANG_GCC_IS from Mk/bsd.default-versions.mk.  As a next
step lang/gcc is going to become a "hull" essentially only providing
those symlinks and requiring lang/gcc5 (or whatever has been set as
default in Mk/bsd.default-versions.mk).
This commit is contained in:
Gerald Pfeifer 2017-05-02 05:40:53 +00:00
parent 8c99ed5982
commit d20f742250
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=439929
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mk/Uses/fortran.mk
View File

@ -17,13 +17,8 @@ fortran_ARGS= gcc
.if ${fortran_ARGS} == gcc
_GCC_VER= ${GCC_DEFAULT:S/.//}
.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
.else
BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
.endif
USE_BINUTILS= yes
F77= gfortran${_GCC_VER}
FC= gfortran${_GCC_VER}

3
Mk/bsd.default-versions.mk
View File

@ -140,7 +140,4 @@ TCLTK_DEFAULT?= 8.6
# Possible values: 4, 5
VARNISH_DEFAULT?= 4
# Version of lang/gcc. Do not override!
LANG_GCC_IS= 5
.endif

4
Mk/bsd.gcc.mk
View File

@ -144,11 +144,7 @@ _USE_GCC:= ${GCC_DEFAULT}
. if ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc)
V:= ${_GCCVERSION_${v}_V:S/.//}
_GCC_PORT_DEPENDS:= gcc${V}
. if ${_USE_GCC} == ${LANG_GCC_IS}
_GCC_PORT:= gcc
. else
_GCC_PORT:= gcc${V}
. endif
CC:= gcc${V}
CXX:= g++${V}
CPP:= cpp${V}