sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add ccache support for building ports. [1]

Browse source 
- Fix CONFIGURE_FAIL_MESSAGE to be pkgng-aware. [2]
- Resolve symlinks in PREFIX on deinstall. [3]
- Introduce CLEAN_FETCH_ENV variable to disable package dependency
  in fetch target for mass fetching. [4]

PR:		ports/169579 [1], ports/170552 [2],
		ports/170784 [3], ports/170796 [4]
Submitted by:	bdrewery@ [1], crees@ [2], gahr@ [3], ohauer@ [4]
Tested on:	pointyhat
This commit is contained in:
Beat Gaetzi 2012-08-30 15:31:25 +00:00
parent 89dfa9b70d
commit 68384983e2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303381
2 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CHANGES
View file

@ -10,6 +10,22 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file. All ports committers are allowed to commit to this file.
20120830:
AUTHOR: beat@FreeBSD.org
* CCACHE support for building ports has been added (depends on
devel/ccache). Therefore new user settable variables are available:
WITH_CCACHE_BUILD - Enable CCACHE support (Default off)
NO_CCACHE - Disable CCACHE support for example for certain
ports if CCACHE is enabled.
By default CCACHE uses $HOME/.ccache as cache directory. To use
a non-default cache directory this could be overwritten like:
MAKE_ENV+= CCACHE_DIR=/var/cache/ccache
20120820: 20120820:
AUTHOR: gahr@FreeBSD.org AUTHOR: gahr@FreeBSD.org

29
Mk/bsd.port.mk
View file

@ -833,6 +833,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# Default: none # Default: none
# FETCH_REGET - Times to retry fetching of files on checksum errors. # FETCH_REGET - Times to retry fetching of files on checksum errors.
# Default: 1 # Default: 1
# CLEAN_FETCH_ENV
# - Disable package dependency in fetch target for mass
# fetching. User settable.
# #
# For extract: # For extract:
# #
@ -934,6 +937,13 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# that are explicitly marked MAKE_JOBS_UNSAFE. User settable. # that are explicitly marked MAKE_JOBS_UNSAFE. User settable.
# MAKE_JOBS_NUMBER # MAKE_JOBS_NUMBER
# - Override the number of make jobs to be used. User settable. # - Override the number of make jobs to be used. User settable.
## cacche
#
# WITH_CCACHE_BUILD
# - Enable CCACHE support (devel/ccache). User settable.
# NO_CCACHE
# - Disable CCACHE support for example for certain ports if
# CCACHE is enabled. User settable.
# #
# For install: # For install:
# #
@ -1626,9 +1636,11 @@ PLIST_SUB+= LIB32DIR=${LIB32DIR}
.if defined(WITH_PKGNG) .if defined(WITH_PKGNG)
.if !defined(PKG_DEPENDS) .if !defined(PKG_DEPENDS)
.if !defined(CLEAN_FETCH_ENV)
PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/ports-mgmt/pkg PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/ports-mgmt/pkg
.endif .endif
.endif .endif
.endif
.if defined(USE_ZIP) .if defined(USE_ZIP)
EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
@ -2217,6 +2229,19 @@ BUILD_FAIL_MESSAGE+= "You have chosen to use multiple make jobs (parallelization
.endif .endif
.endif .endif
# ccache support
# 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*}
# 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
# Prepend the ccache dir into the PATH and setup ccache env
MAKE_ENV+= PATH=${LOCALBASE}/libexec/ccache:${PATH}
.endif
PTHREAD_CFLAGS?= PTHREAD_CFLAGS?=
PTHREAD_LIBS?= -pthread PTHREAD_LIBS?= -pthread
@ -2908,7 +2933,7 @@ CONFIGURE_TARGET:= ${CONFIGURE_TARGET:S/--build=//}
CONFIGURE_LOG?= config.log CONFIGURE_LOG?= config.log
# A default message to print if do-configure fails. # A default message to print if do-configure fails.
CONFIGURE_FAIL_MESSAGE?= "Please report the problem to ${MAINTAINER} [maintainer] and attach the \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\" including the output of the failure of your make command. Also, it might be a good idea to provide an overview of all packages installed on your system (e.g. an \`ls ${PKG_DBDIR}\`)." CONFIGURE_FAIL_MESSAGE?= "Please report the problem to ${MAINTAINER} [maintainer] and attach the \"${CONFIGURE_WRKSRC}/${CONFIGURE_LOG}\" including the output of the failure of your make command. Also, it might be a good idea to provide an overview of all packages installed on your system (e.g. a ${PKG_INFO} -Ea)."
.if defined(GNU_CONFIGURE) .if defined(GNU_CONFIGURE)
# Maximum command line length # Maximum command line length
@ -4474,7 +4499,7 @@ deinstall:
check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \ check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \
if [ "$${check_name}" = "${PKGBASE}" ]; then \ if [ "$${check_name}" = "${PKGBASE}" ]; then \
prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \ prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
if [ "x${PREFIX}" = "x$${prfx}" ]; then \ if [ "x`${READLINK_CMD} -f ${PREFIX}`" = "x$${prfx}" ]; then \
${ECHO_MSG} "===> Deinstalling $${p}"; \ ${ECHO_MSG} "===> Deinstalling $${p}"; \
${PKG_DELETE} -f $${p}; \ ${PKG_DELETE} -f $${p}; \
else \ else \