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 D74307A269 for ; Mon, 12 Sep 2016 12:18:15 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 89C1085ED3; Mon, 12 Sep 2016 12:18:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 17C9B85ED6 for ; Mon, 12 Sep 2016 12:18:15 +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 uom1ngB3nvZ3 for ; Mon, 12 Sep 2016 12:18:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9C1C885EC0 for ; Mon, 12 Sep 2016 12:18:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C8862FBD1; Mon, 12 Sep 2016 12:18:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147368269396640" MIME-Version: 1.0 Date: Mon, 12 Sep 2016 12:18:13 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/mk/compiler To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20160912121813.C8862FBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_147368269396640 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Mon Sep 12 12:18:13 UTC 2016 Modified Files: pkgsrc/mk/compiler: gfortran.mk Log Message: Introduce GFORTRAN_VERSION, pick which version of gfortran is used. modified patch from Rin Okuyama PR pkg/50722: do not hardcode lang/gcc48 in gfortran.mk "looks ok, needs docs" - wiz "it'll do for now, ideally I'd like something more robust and possibly integrate into gcc.mk's path selection" - jperkin To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/mk/compiler/gfortran.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_147368269396640 Content-Disposition: inline Content-Length: 1465 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/compiler/gfortran.mk diff -u pkgsrc/mk/compiler/gfortran.mk:1.8 pkgsrc/mk/compiler/gfortran.mk:1.9 --- pkgsrc/mk/compiler/gfortran.mk:1.8 Wed Nov 25 13:05:47 2015 +++ pkgsrc/mk/compiler/gfortran.mk Mon Sep 12 12:18:13 2016 @@ -1,4 +1,4 @@ -# $NetBSD: gfortran.mk,v 1.8 2015/11/25 13:05:47 jperkin Exp $ +# $NetBSD: gfortran.mk,v 1.9 2016/09/12 12:18:13 maya Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -40,7 +40,9 @@ COMPILER_GFORTRAN_MK= defined .include "../../mk/bsd.prefs.mk" -.if !empty(PKGPATH:Mlang/gcc48) || !empty(PKGPATH:Mdevel/patch) || \ +GFORTRAN_VERSION?= 48 + +.if !empty(PKGPATH:Mlang/gcc${GFORTRAN_VERSION}) || !empty(PKGPATH:Mdevel/patch) || \ !empty(PKGPATH:Mdevel/libtool-base) IGNORE_GFORTRAN= yes MAKEFLAGS+= IGNORE_GFORTRAN=yes @@ -68,7 +70,7 @@ _USE_GFORTRAN= YES .endif .if !empty(_USE_GFORTRAN:M[yY][eE][sS]) -_GFORTRANBASE= ${LOCALBASE}/gcc48 +_GFORTRANBASE= ${LOCALBASE}/gcc${GFORTRAN_VERSION} FC= gfortran _GFORTRAN_DIR= ${WRKDIR}/.gfortran @@ -89,8 +91,8 @@ PREPEND_PATH+= ${_GFORTRAN_DIR}/bin . endif # Add the dependency on gfortran. -BUILDLINK_DEPMETHOD.gcc48= full -. include "../../lang/gcc48/buildlink3.mk" +BUILDLINK_DEPMETHOD.gcc${GFORTRAN_VERSION}= full +. include "../../lang/gcc${GFORTRAN_VERSION}/buildlink3.mk" . if defined(GFORTRAN_DIR) && !empty(GFORTRAN_DIR) PKGSRC_MAKE_ENV+= GFORTRAN_DIR=${GFORTRAN_DIR:Q} --_----------=_147368269396640--