From owner-svn-ports-head@freebsd.org Tue Oct 24 19:13:03 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03878E56398; Tue, 24 Oct 2017 19:13:03 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C66466CF1D; Tue, 24 Oct 2017 19:13:02 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9OJD1UT013816; Tue, 24 Oct 2017 19:13:01 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9OJD1o2013815; Tue, 24 Oct 2017 19:13:01 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201710241913.v9OJD1o2013815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Tue, 24 Oct 2017 19:13:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452811 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 452811 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Oct 2017 19:13:03 -0000 Author: jrm Date: Tue Oct 24 19:13:01 2017 New Revision: 452811 URL: https://svnweb.freebsd.org/changeset/ports/452811 Log: Mk/Uses/fortran.mk: Add flang as a non-default USES=fortran argument. Note, flang is currently only available for amd64. PR: 220313 Submitted by: yuri@rawbw.com Reviewed by: db, jmd, mat, swills Approved by: portmgr Differential Revision: https://reviews.freebsd.org/D12529 Modified: head/Mk/Uses/fortran.mk Modified: head/Mk/Uses/fortran.mk ============================================================================== --- head/Mk/Uses/fortran.mk Tue Oct 24 19:11:30 2017 (r452810) +++ head/Mk/Uses/fortran.mk Tue Oct 24 19:13:01 2017 (r452811) @@ -4,7 +4,7 @@ # # Feature: fortran # Usage: USES=fortran -# Valid ARGS: gcc (default) +# Valid ARGS: flang, gcc (default) # # MAINTAINER: fortran@FreeBSD.org @@ -15,11 +15,20 @@ _INCLUDE_USES_FORTRAN_MK= yes fortran_ARGS= gcc .endif -.if ${fortran_ARGS} == gcc +.if ${fortran_ARGS} == flang +.if ${ARCH} == amd64 +BUILD_DEPENDS+= flang:devel/flang +RUN_DEPENDS+= flang:devel/flang +F77= flang +FC= flang +LDFLAGS+= -L${LOCALBASE}/flang/lib -lflang -lexecinfo +.else +IGNORE= USES=fortran: flang argument only available for amd64 +.endif +.elif ${fortran_ARGS} == gcc _GCC_VER= ${GCC_DEFAULT:S/.//} BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} -USE_BINUTILS= yes F77= gfortran${_GCC_VER} FC= gfortran${_GCC_VER} FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} @@ -30,6 +39,7 @@ LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \ IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS} .endif +USE_BINUTILS= yes CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}" MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"