From owner-svn-ports-all@FreeBSD.ORG Sat Dec 22 23:02:01 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D1D2CA1C; Sat, 22 Dec 2012 23:02:01 +0000 (UTC) (envelope-from takatsu.tomonari@gmail.com) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8F23C8FC0C; Sat, 22 Dec 2012 23:02:00 +0000 (UTC) Received: by mail-la0-f41.google.com with SMTP id m15so7081817lah.0 for ; Sat, 22 Dec 2012 15:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=nQ987sg9OOcWx+LSA8j2GiXHIRr+Qgeo9rw99mGpclw=; b=d4P3ri3OMBSUYf37uP8d3Q52qL/sni7F3eAYvuRzKYZE7NPOyYH5csX6+lzzSzUkLV a5AHsDeFg8+BM/f9mcchHaNNg5NZmKE6yUjmJRo7LXVKAgXyP9bQ0kQ9zRx7+e/luHEy flFIOHgkp75uoXZaur1CiAHt+XI0ZPWwOUM66Fpc4I7SeLG+A+dYP/TJlEkVcvNP7wYT E5VzoNlAjd+EVOMmuRqfFYlMZUzU9BtqpSIWe54rGVO5+5+mO83HatlHj/UfmYjKvBfQ h/vCFDcytXseU1jpyOoBk/Pidlw8TeaswpkTQ/M9yDweLHV4hLgJvlV/sRlKZml9RYDi JqWg== MIME-Version: 1.0 Received: by 10.112.11.68 with SMTP id o4mr7005164lbb.128.1356217318876; Sat, 22 Dec 2012 15:01:58 -0800 (PST) Sender: takatsu.tomonari@gmail.com Received: by 10.114.64.138 with HTTP; Sat, 22 Dec 2012 15:01:58 -0800 (PST) In-Reply-To: <201212222135.qBMLZaUw059843@svn.freebsd.org> References: <201212222135.qBMLZaUw059843@svn.freebsd.org> Date: Sun, 23 Dec 2012 08:01:58 +0900 X-Google-Sender-Auth: OnFfYaSSj-kmcL9T4OsNtCKR--4 Message-ID: Subject: Re: svn commit: r309406 - head/Mk From: TAKATSU Tomonari To: Gerald Pfeifer Content-Type: multipart/mixed; boundary=f46d0408d49d87a5b404d178f35b Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 22 Dec 2012 23:02:01 -0000 --f46d0408d49d87a5b404d178f35b Content-Type: text/plain; charset=ISO-8859-1 2012/12/23 Gerald Pfeifer : > Author: gerald > Date: Sat Dec 22 21:35:35 2012 > New Revision: 309406 > URL: http://svnweb.freebsd.org/changeset/ports/309406 > > Log: > Add a new form of USE_GCC, USE_GCC=yes, which generically requests > a current version of GCC. This reduces churn for individual ports > and further increases consistency (in line with a canonical version > that we introduced with GCC_DEFAULT_VERSION earlier on and the older > USE_FORTRAN=yes). > > On the way, make some comments more consistent. > > Discussed with: linimon > > Modified: > head/Mk/bsd.gcc.mk > > Modified: head/Mk/bsd.gcc.mk > ============================================================================== > --- head/Mk/bsd.gcc.mk Sat Dec 22 20:54:59 2012 (r309405) > +++ head/Mk/bsd.gcc.mk Sat Dec 22 21:35:35 2012 (r309406) > @@ -5,14 +5,20 @@ > # > # Created by: Edwin Groothuis > # > -# For port developers: > +# To request the use of a current version of GCC, specify USE_GCC=yes in > +# your port/system configuration. This is the preferred use of USE_GCC. > +# It defines a canonical, default version of GCC; the same version of > +# GCC is also implied by USE_FORTRAN=yes. > +# > # If your port needs a specific (minimum) version of GCC, you can easily > -# specify that with a "USE_GCC=" statement. Unless absolutely necessary > -# do so by specifying "USE_GCC=X.Y+" which requests at least GCC version > +# specify that with a USE_GCC= statement. Unless absolutely necessary > +# do so by specifying USE_GCC=X.Y+ which requests at least GCC version > # X.Y. To request a specific version omit the trailing + sign. Use of > # a Fortran compiler is declared by the USE_FORTRAN knob, not USE_GCC. > # > # Examples: > +# USE_GCC= yes # port requires a current version of GCC > +# # (4.6 as of today, subject to change). > # USE_GCC= 4.2+ # port requires GCC 4.2 or later. > # USE_GCC= 4.7 # port requires GCC 4.7. > # > @@ -54,6 +60,10 @@ GCC_DEFAULT_V= ${GCC_DEFAULT_VERSION:S/. > # No configurable parts below this. #################################### > # > > +.if ${USE_GCC} == yes > +USE_GCC= ${GCC_DEFAULT_VERSION}+ > +.endif > + > # Extract the fields from GCCVERSION_... > .for v in ${GCCVERSIONS} > . for j in ${GCCVERSION_${v}} > @@ -104,7 +114,7 @@ MAKE_ENV+= F77="${F77}" FC="${FC}" FFLA > > . if ${USE_GCC} == any > > -# enable the clang-is-cc workaround. default to the last gcc imported > +# Enable the clang-is-cc workaround. Default to the last GCC imported > # into base. > _USE_GCC:= 4.2 > _GCC_ORLATER:= true Following errors occur in ports defined USE_FORTRAN=yes which includes bsd.gcc.mk "/usr/ports/Mk/bsd.gcc.mk", line 64: Malformed conditional (${USE_GCC} == yes) "/usr/ports/Mk/bsd.port.mk", line 6598: if-less endif make: fatal errors encountered -- cannot continue Please confirm some of them and my patch. Thanks, -- TAKATSU Tomonari --f46d0408d49d87a5b404d178f35b Content-Type: application/octet-stream; name="bsd.gcc.mk.patch" Content-Disposition: attachment; filename="bsd.gcc.mk.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hb1cpcvu0 SW5kZXg6IGJzZC5nY2MubWsKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gYnNkLmdjYy5tawkocmV2aXNpb24gMzA5 NDA3KQorKysgYnNkLmdjYy5tawkod29ya2luZyBjb3B5KQpAQCAtNjAsNyArNjAsNyBAQAogIyBO byBjb25maWd1cmFibGUgcGFydHMgYmVsb3cgdGhpcy4gIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjCiAjCiAKLS5pZiAke1VTRV9HQ0N9ID09IHllcworLmlmIGRlZmluZWQoVVNF X0dDQykgJiYgJHtVU0VfR0NDfSA9PSB5ZXMKIFVTRV9HQ0M9CSR7R0NDX0RFRkFVTFRfVkVSU0lP Tn0rCiAuZW5kaWYKIAo= --f46d0408d49d87a5b404d178f35b--