From owner-svn-ports-all@FreeBSD.ORG Fri Sep 26 16:00:42 2014 Return-Path: Delivered-To: svn-ports-all@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 62EE9C9C; Fri, 26 Sep 2014 16:00:42 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34109EE4; Fri, 26 Sep 2014 16:00:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8QG0gSf040741; Fri, 26 Sep 2014 16:00:42 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8QG0f0t040739; Fri, 26 Sep 2014 16:00:41 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409261600.s8QG0f0t040739@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 26 Sep 2014 16:00:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369328 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Sep 2014 16:00:42 -0000 Author: tijl Date: Fri Sep 26 16:00:41 2014 New Revision: 369328 URL: http://svnweb.freebsd.org/changeset/ports/369328 QAT: https://qat.redports.org/buildarchive/r369328/ Log: 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 Approved by: gerald Modified: head/Mk/Uses/fortran.mk head/Mk/bsd.gcc.mk Modified: head/Mk/Uses/fortran.mk ============================================================================== --- head/Mk/Uses/fortran.mk Fri Sep 26 15:00:18 2014 (r369327) +++ head/Mk/Uses/fortran.mk Fri Sep 26 16:00:41 2014 (r369328) @@ -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} Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Fri Sep 26 15:00:18 2014 (r369327) +++ head/Mk/bsd.gcc.mk Fri Sep 26 16:00:41 2014 (r369328) @@ -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}