diff options
| author | tijl <tijl@FreeBSD.org> | 2017-11-18 21:09:56 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2017-11-18 21:09:56 +0800 |
| commit | fffc9140bd9c2e749b7d79108d7734cb9ed742e4 (patch) | |
| tree | 160da500260242b718768b43a1fc39ab2a0a74c1 /Mk | |
| parent | 14406ea04e045d2b1d870f80bd74668c01197842 (diff) | |
| download | freebsd-ports-graphics-fffc9140bd9c2e749b7d79108d7734cb9ed742e4.tar.gz freebsd-ports-graphics-fffc9140bd9c2e749b7d79108d7734cb9ed742e4.tar.zst freebsd-ports-graphics-fffc9140bd9c2e749b7d79108d7734cb9ed742e4.zip | |
- Allow users to change the default Fortran compiler via DEFAULT_VERSIONS.
- Rename USES=fortran:gcc to the more appropriate USES=fortran:gfortran.
- Change the options in math/R and math/libRmath so the choice becomes
flang or default instead of flang or gfortran. Use default Fortran
compiler again on amd64.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/fortran.mk | 6 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk index 1d019c531b9..ae97e565e5b 100644 --- a/Mk/Uses/fortran.mk +++ b/Mk/Uses/fortran.mk @@ -4,7 +4,7 @@ # # Feature: fortran # Usage: USES=fortran -# Valid ARGS: flang, gcc (default) +# Valid ARGS: flang, gfortran (default) # # MAINTAINER: fortran@FreeBSD.org @@ -12,7 +12,7 @@ _INCLUDE_USES_FORTRAN_MK= yes .if empty(fortran_ARGS) -fortran_ARGS= gcc +fortran_ARGS= ${FORTRAN_DEFAULT} .endif .if ${fortran_ARGS} == flang @@ -25,7 +25,7 @@ LDFLAGS+= -L${LOCALBASE}/flang/lib -Wl,--as-needed -lflang -lexecinfo -Wl,--no-a .else IGNORE= USES=fortran: flang argument only available for amd64 .endif -.elif ${fortran_ARGS} == gcc +.elif ${fortran_ARGS} == gfortran _GCC_VER= ${GCC_DEFAULT:S/.//} BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 28fd89f8843..4e29d57965b 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -15,8 +15,8 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes LOCALBASE?= /usr/local -.for lang in APACHE BDB FIREBIRD FPC GCC GHOSTSCRIPT LINUX LUA MYSQL PERL5 \ - PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK +.for lang in APACHE BDB FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA MYSQL \ + PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK .if defined(${lang}_DEFAULT) WARNING+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" WARNING+= "This behaviour has never been supported and will be removed on 2017-01-31" @@ -35,6 +35,8 @@ APACHE_DEFAULT?= 2.4 BDB_DEFAULT?= 5 # Possible values: 2.5 FIREBIRD_DEFAULT?= 2.5 +# Possible values: flang (experimental), gfortran +FORTRAN_DEFAULT?= gfortran # Possible values: 3.0.0 FPC_DEFAULT?= 3.0.2 # Possible values: 4.8, 4.9, 5, 6, 7 |