svn commit: r384027 - in head: Mk ports-mgmt/pkg ports-mgmt/pkg-devel

[Bryan Drewery]

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