diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-27 00:00:41 +0800 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-27 00:00:41 +0800 |
| commit | 6defc67c4da5873063bbb2cda888c14200e93e2d (patch) | |
| tree | 5e48dec97d9e2ca4278afaa3e40b822e19ad2231 /Mk | |
| parent | e9de139c6808974bf562f6dc5507112a7c456849 (diff) | |
| download | freebsd-ports-gnome-6defc67c4da5873063bbb2cda888c14200e93e2d.tar.gz freebsd-ports-gnome-6defc67c4da5873063bbb2cda888c14200e93e2d.tar.zst freebsd-ports-gnome-6defc67c4da5873063bbb2cda888c14200e93e2d.zip | |
Depend on lang/gccXY if users wish to use a different version of gcc by
default than lang/gcc (currently 4.8).
(I don't fully agree with this implementation but this makes something
like DEFAULT_VERSIONS+=gcc=4.9 in make.conf work correctly.)
Reported by: Luca Pizzamiglio <luca.pizzamiglio@gmail.com>
Approved by: gerald
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/fortran.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.gcc.mk | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk index 3d2e54c459fe..5d9798eb4e4c 100644 --- a/Mk/Uses/fortran.mk +++ b/Mk/Uses/fortran.mk @@ -18,8 +18,13 @@ fortran_ARGS= gcc .if ${fortran_ARGS} == gcc .include "${PORTSDIR}/Mk/bsd.default-versions.mk" _GCC_VER= ${GCC_DEFAULT:S/.//} +.if ${_GCC_VER} == 48 BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc +.else +BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER} +RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER} +.endif USE_BINUTILS= yes F77= gfortran${_GCC_VER} FC= gfortran${_GCC_VER} diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index 5f472db33bd8..2495c463d4ad 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -46,7 +46,8 @@ GCCVERSION_040700= 0 0 4.7 GCCVERSION_040800= 0 0 4.8 GCCVERSION_040900= 0 0 4.9 -GCC_DEFAULT_V= ${GCC_DEFAULT:S/.//} +# Version of lang/gcc +GCC_DEFAULT_V= 4.8 # No configurable parts below this. #################################### # @@ -148,7 +149,7 @@ _USE_GCC:= ${GCC_DEFAULT} . 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} +. if ${_USE_GCC} == ${GCC_DEFAULT_V} _GCC_PORT:= gcc . else _GCC_PORT:= gcc${V} |