Unfortunately the change in r237958 resulted in s/install/instclean/ due to
the aggressive pattern matching of the :C modifier. I tested build and install in 2 phases, however with different solutions, resulting in the breakage. Mea culpa. The solution is to break out the all: target. This causes a few lines of code duplication, but now the all: target works as it should, and the other targets continue to work as they did before. While I'm here, add a ===> header line to the start of each port build to make it easier to find/more clear in the logs.
This commit is contained in:
parent
f25e72cbb8
commit
1e8e2a9d7d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=238038
@ -60,11 +60,21 @@ PORTSMODULESENV=\
|
||||
SRC_BASE=${SRC_BASE} \
|
||||
OSVERSION=${OSRELDATE} \
|
||||
WRKDIRPREFIX=${WRKDIRPREFIX}
|
||||
.for __target in all install reinstall clean
|
||||
|
||||
# The WRKDIR needs to be cleaned before building, and trying to change the target
|
||||
# with a :C pattern below results in install -> instclean
|
||||
all:
|
||||
.for __i in ${PORTS_MODULES}
|
||||
@${ECHO} "===> Ports module ${__i} (all)"
|
||||
cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean all
|
||||
.endfor
|
||||
|
||||
.for __target in install reinstall clean
|
||||
${__target}: ports-${__target}
|
||||
ports-${__target}:
|
||||
.for __i in ${PORTS_MODULES}
|
||||
cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/all/clean all/:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
|
||||
@${ECHO} "===> Ports module ${__i} (${__target})"
|
||||
cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
|
||||
.endfor
|
||||
.endfor
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user