Makefile.inc1: use make builtin :ts instead of sed
Commit 3eb1b4da3cf7 replaced "xargs -n1" with a sed expression to convert from space to newline as a list separator for *-old-* targets. Dan Nelson followed up with a suggestion to use make's built-in :ts instead, which should be slightly more efficient. Reviewed by: sjg Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39972
This commit is contained in:
parent
8216f1a9cc
commit
f705765261
@ -3245,10 +3245,9 @@ RM_I=-fv
|
|||||||
list-old-files: .PHONY
|
list-old-files: .PHONY
|
||||||
@cd ${.CURDIR}; \
|
@cd ${.CURDIR}; \
|
||||||
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
|
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
|
||||||
-V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" \
|
-V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \
|
||||||
-V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib32," \
|
-V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib32,:ts\n" \
|
||||||
-V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib32," | \
|
-V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib32,:ts\n" | sort
|
||||||
sed -E 's/[[:space:]]+/\n/g' | sort
|
|
||||||
|
|
||||||
delete-old-files: .PHONY
|
delete-old-files: .PHONY
|
||||||
@echo ">>> Removing old files (only deletes safe to delete libs)"
|
@echo ">>> Removing old files (only deletes safe to delete libs)"
|
||||||
@ -3312,10 +3311,10 @@ check-old-files: .PHONY
|
|||||||
list-old-libs: .PHONY
|
list-old-libs: .PHONY
|
||||||
@cd ${.CURDIR}; \
|
@cd ${.CURDIR}; \
|
||||||
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
|
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
|
||||||
-V OLD_LIBS -V MOVED_LIBS -V "OLD_LIBS:Mlib/*:S,^lib,usr/lib32," \
|
-V "OLD_LIBS:ts\n" -V "MOVED_LIBS:ts\n" \
|
||||||
-V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib32," \
|
-V "OLD_LIBS:Mlib/*:S,^lib,usr/lib32,:ts\n" \
|
||||||
-V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib32," | \
|
-V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib32,:ts\n" \
|
||||||
sed -E 's/[[:space:]]+/\n/g' | sort
|
-V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib32,:ts\n" | sort
|
||||||
|
|
||||||
delete-old-libs: .PHONY
|
delete-old-libs: .PHONY
|
||||||
@echo ">>> Removing old libraries"
|
@echo ">>> Removing old libraries"
|
||||||
|
Loading…
Reference in New Issue
Block a user