From owner-svn-ports-head@FreeBSD.ORG Fri Dec 13 13:22:33 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D56F8BA; Fri, 13 Dec 2013 13:22:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4008B176E; Fri, 13 Dec 2013 13:22:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBDDMXdA038802; Fri, 13 Dec 2013 13:22:33 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBDDMWZC038800; Fri, 13 Dec 2013 13:22:32 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312131322.rBDDMWZC038800@svn.freebsd.org> From: Tijl Coosemans Date: Fri, 13 Dec 2013 13:22:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336343 - in head: . Mk/Uses X-SVN-Group: ports-head 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.17 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: Fri, 13 Dec 2013 13:22:33 -0000 Author: tijl Date: Fri Dec 13 13:22:32 2013 New Revision: 336343 URL: http://svnweb.freebsd.org/changeset/ports/336343 Log: New USES=fortran to replace USE_FORTRAN. USE_FORTRAN=yes can be replaced with USES=fortran or USES=fortran:gcc. USE_FORTRAN=ifort can be replaced with USES=fortran:ifort. USE_FORTRAN=f77 is deprecated and the version of gcc it depends on (lang/gcc34) is scheduled to be removed. Note that USE_FORTRAN=yes also makes GCC the C/C++ compiler while USES=fortran only sets the Fortran compiler and can be used together with Clang as C/C++ compiler. Added: head/Mk/Uses/fortran.mk (contents, props changed) Modified: head/CHANGES Modified: head/CHANGES ============================================================================== --- head/CHANGES Fri Dec 13 12:58:42 2013 (r336342) +++ head/CHANGES Fri Dec 13 13:22:32 2013 (r336343) @@ -10,6 +10,20 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20131213: +AUTHOR: tijl@FreeBSD.org + + New USES=fortran to replace USE_FORTRAN. + + USE_FORTRAN=yes can be replaced with USES=fortran or USES=fortran:gcc. + USE_FORTRAN=ifort can be replaced with USES=fortran:ifort. + USE_FORTRAN=f77 is deprecated and the version of gcc it depends + on (lang/gcc34) is scheduled to be removed. + + Note that USE_FORTRAN=yes also makes GCC the C/C++ compiler while + USES=fortran only sets the Fortran compiler and can be used together + with Clang as C/C++ compiler. + 20131208: AUTHOR: mva@FreeBSD.org Added: head/Mk/Uses/fortran.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/fortran.mk Fri Dec 13 13:22:32 2013 (r336343) @@ -0,0 +1,39 @@ +# $FreeBSD$ +# +# Fortran support +# +# MAINTAINER: fortran@FreeBSD.org +# +# Feature: fortran +# Usage: USES=fortran +# Valid ARGS: gcc (default), ifort + +.if !defined(_INCLUDE_USES_FORTRAN_MK) +_INCLUDE_USES_FORTRAN_MK= yes + +.if !defined(fortran_ARGS) +fortran_ARGS= gcc +.endif + +.if ${fortran_ARGS} == gcc +_GCC_VER= 46 +BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc +RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc +USE_BINUTILS= yes +F77= gfortran${_GCC_VER} +FC= gfortran${_GCC_VER} +FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} +LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} +.elif ${fortran_ARGS} == ifort +BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc +RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc +F77= ${LOCALBASE}/intel_fc_80/bin/ifort +FC= ${LOCALBASE}/intel_fc_80/bin/ifort +.else +IGNORE= USES=fortran: invalid arguments: ${fortran_ARGS} +.endif + +CONFIGURE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" +MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" + +.endif