From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 14 12:10:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38E63106566C for ; Thu, 14 Jul 2011 12:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 162CF8FC18 for ; Thu, 14 Jul 2011 12:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6ECA90V016634 for ; Thu, 14 Jul 2011 12:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6ECA9ou016633; Thu, 14 Jul 2011 12:10:09 GMT (envelope-from gnats) Resent-Date: Thu, 14 Jul 2011 12:10:09 GMT Resent-Message-Id: <201107141210.p6ECA9ou016633@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pan Tsu Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE72F106564A for ; Thu, 14 Jul 2011 12:03:44 +0000 (UTC) (envelope-from inyaoo@gmail.com) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4C8808FC14 for ; Thu, 14 Jul 2011 12:03:44 +0000 (UTC) Received: by eyg7 with SMTP id 7so125719eyg.13 for ; Thu, 14 Jul 2011 05:03:43 -0700 (PDT) Received: by 10.14.8.211 with SMTP id 59mr740255eer.92.1310645023353; Thu, 14 Jul 2011 05:03:43 -0700 (PDT) Received: from localhost (rainbowwarrior.torservers.net [77.247.181.164]) by mx.google.com with ESMTPS id a8sm122775een.47.2011.07.14.05.03.26 (version=SSLv3 cipher=OTHER); Thu, 14 Jul 2011 05:03:38 -0700 (PDT) Message-Id: <867h7ldq8s.fsf@gmail.com> Date: Thu, 14 Jul 2011 16:02:43 +0400 From: Pan Tsu To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/158888: [patch] devel/ccache: relax EXTRA_COMPILERS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2011 12:10:10 -0000 >Number: 158888 >Category: ports >Synopsis: [patch] devel/ccache: relax EXTRA_COMPILERS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 14 12:10:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Pan Tsu >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: - EXTRA_COMPILERS = basegcc baseg++ (unchanged for more than a year) - basegcc & baseg++ are in PATH but not in /usr/bin or LOCALBASE/bin - cc & c++ are configurable symlinks, just after ccache in PATH >Description: Before ccache-update-links was added the port advertised EXTRA_COMPILERS make/env variable and didn't apply any checks to its value. As the changes to them are not mentioned in either commit log or UPDATING relax checks to not break valid user configurations. - add every known compiler from PATH[1], i.e. do not hardcode search path - restore EXTRA_COMPILERS to the list of known compilers[2] [1] a user (root in this case) is responsible for setting safe PATH [2] as it can be replaced by CCACHE_COMPILERS defined in make.conf EXTRA_COMPILERS can be phased out *with* an entry in UPDATING >How-To-Repeat: >Fix: --- a.diff begins here --- Index: devel/ccache/Makefile =================================================================== RCS file: /a/.cvsup/ports/devel/ccache/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- devel/ccache/Makefile 11 Jun 2011 21:10:12 -0000 1.62 +++ devel/ccache/Makefile 14 Jul 2011 11:27:00 -0000 @@ -35,6 +35,7 @@ CCACHE_COMPILERS+= icc icpc GNU_COMPILERS+= 34 42 43 44 45 46 CCACHE_COMPILERS+= cc c++ gcc g++ ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} CCACHE_COMPILERS+= clang clang++ llvm-gcc llvm-c++ llvm-g++ +CCACHE_COMPILERS+= ${EXTRA_COMPILERS} SUB_LIST+= CCACHE_COMPILERS="${CCACHE_COMPILERS}" \ CCLINKDIR="${CCLINKDIR}" \ ICCPREFIX="${LOCALBASE}/intel_cc_80/bin" \ Index: devel/ccache/files/ccache-update-links.sh.in =================================================================== RCS file: /a/.cvsup/ports/devel/ccache/files/ccache-update-links.sh.in,v retrieving revision 1.1 diff -u -p -r1.1 ccache-update-links.sh.in --- devel/ccache/files/ccache-update-links.sh.in 29 Mar 2011 14:15:03 -0000 1.1 +++ devel/ccache/files/ccache-update-links.sh.in 14 Jul 2011 11:29:49 -0000 @@ -32,7 +32,7 @@ esac # create compiler links for comp in ${CCACHE_COMPILERS} do - if [ -f "${PREFIX}/bin/${comp}" ] || [ -f "/usr/bin/${comp}" ]; then + if command -v "${comp}" >/dev/null; then if [ ! -L "${PREFIX}/${CCLINKDIR}/${comp}" ]; then [ "$1" = "-v" ] && echo "create symlink for ${comp}" ln -sf ${PREFIX}/bin/ccache ${PREFIX}/${CCLINKDIR}/${comp} --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: