From owner-svn-ports-all@FreeBSD.ORG Tue Apr 14 20:58:28 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 19266164; Tue, 14 Apr 2015 20:58:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DB574F2C; Tue, 14 Apr 2015 20:58:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EKwRGZ098951; Tue, 14 Apr 2015 20:58:27 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EKwRAf098945; Tue, 14 Apr 2015 20:58:27 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201504142058.t3EKwRAf098945@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 14 Apr 2015 20:58:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384027 - in head: Mk ports-mgmt/pkg ports-mgmt/pkg-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 14 Apr 2015 20:58:28 -0000 Author: bdrewery Date: Tue Apr 14 20:58:26 2015 New Revision: 384027 URL: https://svnweb.freebsd.org/changeset/ports/384027 Log: Let WITH_CCACHE_BUILD work on the pkg port that is not PKG_ORIGIN. For example, if ports-mgmt/pkg is PKG_ORIGIN then it is safe to use ccache for ports-mgmt/pkg-devel. Modified: head/Mk/bsd.ccache.mk head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg/Makefile Modified: head/Mk/bsd.ccache.mk ============================================================================== --- head/Mk/bsd.ccache.mk Tue Apr 14 20:55:33 2015 (r384026) +++ head/Mk/bsd.ccache.mk Tue Apr 14 20:58:26 2015 (r384027) @@ -20,8 +20,8 @@ WARNING+= WITH_CCACHE_BUILD support disa # don't use if ccache already set in CC .if !defined(NO_CCACHE) && defined(WITH_CCACHE_BUILD) && !${CC:M*ccache*} && \ !defined(NO_BUILD) && !defined(NOCCACHE) -# Avoid depends loops between pkg and ccache -. if !${.CURDIR:M*/devel/ccache} && !${.CURDIR:M*/ports-mgmt/pkg} +# Avoid depends loops between ccache and pkg +. if ${PKGORIGIN} != devel/ccache && ${PKGORIGIN} != ${PKG_ORIGIN} BUILD_DEPENDS+= ${LOCALBASE}/bin/ccache:${PORTSDIR}/devel/ccache . endif Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Tue Apr 14 20:55:33 2015 (r384026) +++ head/ports-mgmt/pkg-devel/Makefile Tue Apr 14 20:58:26 2015 (r384027) @@ -16,9 +16,6 @@ COMMENT= Package manager LICENSE= BSD2CLAUSE -# Disable CCACHE support because of the chicken/egg problem pkg should always -# With no dependency at all -NO_CCACHE= yes WITH_DEBUG= yes CFLAGS+= -O0 -g -Wno-error USE_LDCONFIG= yes Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Tue Apr 14 20:55:33 2015 (r384026) +++ head/ports-mgmt/pkg/Makefile Tue Apr 14 20:58:26 2015 (r384027) @@ -14,9 +14,6 @@ COMMENT= Package manager LICENSE= BSD2CLAUSE -# Disable CCACHE support because of the chicken/egg problem pkg should always -# With no dependency at all -NO_CCACHE= yes USE_LDCONFIG= yes USES= libtool tar:xz GNU_CONFIGURE= yes