[Midnightbsd-cvs] mports [18082] trunk/Mk/components: turn off license catalog install in the event we have a NO_BUILD NO_INSTALL situation also known as a metaport.

[laffer1 at midnightbsd.org]

Revision: 18082
          http://svnweb.midnightbsd.org/mports/?rev=18082
Author:   laffer1
Date:     2015-03-08 15:38:00 -0400 (Sun, 08 Mar 2015)
Log Message:
-----------
turn off license catalog install in the event we have a NO_BUILD NO_INSTALL situation also known as a metaport. This is blocking installs

Modified Paths:
--------------
    trunk/Mk/components/licenses.mk

Added Paths:
-----------
    trunk/Mk/components/ccache.mk

Added: trunk/Mk/components/ccache.mk
===================================================================
--- trunk/Mk/components/ccache.mk	                        (rev 0)
+++ trunk/Mk/components/ccache.mk	2015-03-08 19:38:00 UTC (rev 18082)
@@ -0,0 +1,48 @@
+# $MidnightBSD$
+
+COMMANDS_Include_MAINTAINER=	ports at midnightbsd.org
+
+.if !defined(_CCACHEMKINCLUDED)
+
+_CCACHEMKINCLUDED=	yes
+
+# Try to set a default CCACHE_DIR to workaround HOME=/dev/null and
+# HOME=${WRKDIR}/* staging fixes
+.if defined(WITH_CCACHE_BUILD) && !defined(CCACHE_DIR) && \
+    (!defined(HOME) || ${HOME} == /dev/null || ${HOME:S/^${WRKDIR}//} != ${HOME})
+.  if defined(USER) && ${USER} == root
+CCACHE_DIR=	/root/.ccache
+.  else
+NO_CCACHE=	yes
+WARNING+=	WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR.
+.  endif
+.endif
+
+# Support NO_CCACHE for common setups, require WITH_CCACHE_BUILD, and
+# 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}
+BUILD_DEPENDS+=		${LOCALBASE}/bin/ccache:${PORTSDIR}/devel/ccache
+.	endif
+
+_CCACHE_PATH=	${LOCALBASE}/libexec/ccache
+
+# Prepend the ccache dir into the PATH and setup ccache env
+PATH:=	${_CCACHE_PATH}:${PATH}
+#.MAKEFLAGS:		PATH=${PATH}
+.if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*}
+MAKE_ENV+=			PATH=${PATH}
+CONFIGURE_ENV+=		PATH=${PATH}
+.endif
+
+# Ensure this is always in subchild environments
+.	if defined(CCACHE_DIR)
+#.MAKEFLAGS:		CCACHE_DIR=${CCACHE_DIR}
+MAKE_ENV+=		CCACHE_DIR="${CCACHE_DIR}"
+CONFIGURE_ENV+=	CCACHE_DIR="${CCACHE_DIR}"
+.	endif
+.endif
+
+.endif


Property changes on: trunk/Mk/components/ccache.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/Mk/components/licenses.mk
===================================================================
--- trunk/Mk/components/licenses.mk	2015-03-08 19:32:05 UTC (rev 18081)
+++ trunk/Mk/components/licenses.mk	2015-03-08 19:38:00 UTC (rev 18082)
@@ -590,6 +590,11 @@
 	@${RM} -f ${_LICENSE_ASK_DATA}
 .endif
 
+# Meta ports set these and we currently don't install the files if this is there# TODO: make license catalog always install
+.if defined(NO_BUILD) || defined(NO_INSTALL)
+NO_LICENSES_INSTALL=yes
+.endif
+
 # Create report and catalog
 .if !defined(NO_LICENSES_INSTALL)
 	@${RM} -f ${_LICENSE_CATALOG_TMP} ${_LICENSE_REPORT_TMP}