From owner-svn-ports-head@freebsd.org Tue May 2 05:40:55 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 89534D59BDA; Tue, 2 May 2017 05:40:55 +0000 (UTC) (envelope-from gerald@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 4B7F69E; Tue, 2 May 2017 05:40:55 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v425eske075105; Tue, 2 May 2017 05:40:54 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v425esLx075102; Tue, 2 May 2017 05:40:54 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201705020540.v425esLx075102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Tue, 2 May 2017 05:40:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439929 - 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.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, 02 May 2017 05:40:55 -0000 Author: gerald Date: Tue May 2 05:40:53 2017 New Revision: 439929 URL: https://svnweb.freebsd.org/changeset/ports/439929 Log: As of today, USE_GCC=yes (and USE_GCC=any in most circumstances) and consequently many of the USES=compiler flavors use the canonical version of GCC as defined in Mk/bsd.default-versions.mk as well as the lang/gcc port With the "new" setup starting with GCC 5 where I have introduced lang/gcc5-devel for regular snapshots and lang/gcc5 for releases, and similarly for GCC 6 and onward, we can now leverage lang/gcc5 (and later) for most of the role that lang/gcc used to play -- and indeed as of today lang/gcc and lang/gcc5 are nearly identical short of symlinks for gcc, g++, and gfortran binaries that the former provides. So now use lang/gcc5 instead of lang/gcc whenever requested via the USE_GCC framework directly or indirectly. This is similar to how the python ports work, for example, and it allows simplifications in Mk/bsd.gcc.mk and Mk/Uses/fortran.mk and dropping LANG_GCC_IS from Mk/bsd.default-versions.mk. As a next step lang/gcc is going to become a "hull" essentially only providing those symlinks and requiring lang/gcc5 (or whatever has been set as default in Mk/bsd.default-versions.mk). Modified: head/Mk/Uses/fortran.mk head/Mk/bsd.default-versions.mk head/Mk/bsd.gcc.mk Modified: head/Mk/Uses/fortran.mk ============================================================================== --- head/Mk/Uses/fortran.mk Tue May 2 05:26:40 2017 (r439928) +++ head/Mk/Uses/fortran.mk Tue May 2 05:40:53 2017 (r439929) @@ -17,13 +17,8 @@ fortran_ARGS= gcc .if ${fortran_ARGS} == gcc _GCC_VER= ${GCC_DEFAULT:S/.//} -.if ${GCC_DEFAULT} == ${LANG_GCC_IS} -BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc -RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc -.else BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} -.endif USE_BINUTILS= yes F77= gfortran${_GCC_VER} FC= gfortran${_GCC_VER} Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Tue May 2 05:26:40 2017 (r439928) +++ head/Mk/bsd.default-versions.mk Tue May 2 05:40:53 2017 (r439929) @@ -140,7 +140,4 @@ TCLTK_DEFAULT?= 8.6 # Possible values: 4, 5 VARNISH_DEFAULT?= 4 -# Version of lang/gcc. Do not override! -LANG_GCC_IS= 5 - .endif Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Tue May 2 05:26:40 2017 (r439928) +++ head/Mk/bsd.gcc.mk Tue May 2 05:40:53 2017 (r439929) @@ -144,11 +144,7 @@ _USE_GCC:= ${GCC_DEFAULT} . if ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc) V:= ${_GCCVERSION_${v}_V:S/.//} _GCC_PORT_DEPENDS:= gcc${V} -. if ${_USE_GCC} == ${LANG_GCC_IS} -_GCC_PORT:= gcc -. else _GCC_PORT:= gcc${V} -. endif CC:= gcc${V} CXX:= g++${V} CPP:= cpp${V}