Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 329B97A16D for ; Thu, 4 May 2017 18:44:14 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9DA4284DF4; Thu, 4 May 2017 18:44:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2DBD684D98 for ; Thu, 4 May 2017 18:44:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id j_7_5pv2TYK1 for ; Thu, 4 May 2017 18:44:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9BA1184CEE for ; Thu, 4 May 2017 18:44:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 92CBEFBE4; Thu, 4 May 2017 18:44:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1493923452185600" MIME-Version: 1.0 Date: Thu, 4 May 2017 18:44:12 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/mk/compiler To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170504184412.92CBEFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1493923452185600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Thu May 4 18:44:12 UTC 2017 Modified Files: pkgsrc/mk/compiler: gcc.mk Log Message: Add GCC_VERSION_SUFFIX, which can be used i.e. on SuSE systems to select between different compiler versions. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 pkgsrc/mk/compiler/gcc.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1493923452185600 Content-Disposition: inline Content-Length: 3354 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/compiler/gcc.mk diff -u pkgsrc/mk/compiler/gcc.mk:1.176 pkgsrc/mk/compiler/gcc.mk:1.177 --- pkgsrc/mk/compiler/gcc.mk:1.176 Sun Apr 16 23:12:37 2017 +++ pkgsrc/mk/compiler/gcc.mk Thu May 4 18:44:12 2017 @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.176 2017/04/16 23:12:37 khorben Exp $ +# $NetBSD: gcc.mk,v 1.177 2017/05/04 18:44:12 joerg Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -20,6 +20,10 @@ # When set to "yes", the runtime gcc libraries (libgcc, libstdc++ # etc) will be used from pkgsrc rather than the native compiler. # +# GCC_VERSION_SUFIXX +# Optional suffix for GCC binaries, i.e. if the installed names are like +# /usr/bin/g++-5, /usr/bin/gcc-5 etc. + # Package-settable variables: # # GCC_REQD @@ -714,44 +718,44 @@ _GCCBINDIR= ${_CC:H} .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) _GCC_BIN_PREFIX= ${MACHINE_GNU_PLATFORM}- .endif -.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}gcc) +.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}gcc${GCC_VERSION_SUFFIX}) _GCC_VARS+= CC -_GCC_CC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}gcc +_GCC_CC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}gcc${GCC_VERSION_SUFFIX} _ALIASES.CC= cc gcc -CCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}gcc +CCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}gcc${GCC_VERSION_SUFFIX} PKG_CC:= ${_GCC_CC} .endif -.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}cpp) +.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}cpp${GCC_VERSION_SUFFIX}) _GCC_VARS+= CPP -_GCC_CPP= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}cpp +_GCC_CPP= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}cpp${GCC_VERSION_SUFFIX} _ALIASES.CPP= cpp -CPPPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}cpp +CPPPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}cpp${GCC_VERSION_SUFFIX} PKG_CPP:= ${_GCC_CPP} .endif -.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}g++) +.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}g++${GCC_VERSION_SUFFIX}) _GCC_VARS+= CXX -_GCC_CXX= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}g++ +_GCC_CXX= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}g++${GCC_VERSION_SUFFIX} _ALIASES.CXX= c++ g++ -CXXPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g++ +CXXPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g++${GCC_VERSION_SUFFIX} PKG_CXX:= ${_GCC_CXX} .endif -.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77) +.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77${GCC_VERSION_SUFFIX}) _GCC_VARS+= FC -_GCC_FC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}g77 +_GCC_FC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}g77${GCC_VERSION_SUFFIX} _ALIASES.FC= f77 g77 FC= g77 -FCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77 -F77PATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77 +FCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77${GCC_VERSION_SUFFIX} +F77PATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77${GCC_VERSION_SUFFIX} PKG_FC:= ${_GCC_FC} PKGSRC_FORTRAN?= g77 .endif -.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}gfortran) +.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}gfortran${GCC_VERSION_SUFFIX}) _GCC_VARS+= FC -_GCC_FC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}gfortran +_GCC_FC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}gfortran${GCC_VERSION_SUFFIX} _ALIASES.FC= gfortran FC= gfortran -FCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}gfortran -F77PATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}gfortran +FCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}gfortran${GCC_VERSION_SUFFIX} +F77PATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}gfortran${GCC_VERSION_SUFFIX} PKG_FC:= ${_GCC_FC} PKGSRC_FORTRAN?= gfortran .endif --_----------=_1493923452185600--