d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the delete-old/check-old targets to work with arbitrarily long

Browse Source 
OLD_FILES/OLD_DIRS/OLD_LIBS lists.

If you specify enough WITHOUT_FOO flags, the argument list passed to the
shell will be too long. Using .for/.endfor make(1) "loop" will make the
parser of the Makefile explode. Hack around this with good old pipes.

No objections:	netchild
Reported by:	b.f.
This commit is contained in:
Ulrich Spörlein 2011-04-01 20:59:23 +00:00
parent 62d8da8c3a
commit 86be754604
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile.inc1
View File

@ -1355,10 +1355,16 @@ delete-old-files:
@echo ">>> Removing old files (only deletes safe to delete libs)" @echo ">>> Removing old files (only deletes safe to delete libs)"
# Ask for every old file if the user really wants to remove it. # Ask for every old file if the user really wants to remove it.
# It's annoying, but better safe than sorry. # It's annoying, but better safe than sorry.
@for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ # NB: We cannot pass the list of OLD_FILES as a parameter because the
# argument list will get too long. Using .for/.endfor make "loops" will make
# the Makefile parser segfault.
@exec 3<&0; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
while read file; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
rm ${RM_I} "${DESTDIR}/$${file}"; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
fi; \ fi; \
done done
# Remove catpages without corresponding manpages. # Remove catpages without corresponding manpages.
@ -1368,14 +1374,16 @@ delete-old-files:
while read catpage; do \ while read catpage; do \
read manpage; \ read manpage; \
if [ ! -e "$${manpage}" ]; then \ if [ ! -e "$${manpage}" ]; then \
rm ${RM_I} $${catpage} <&3 ; \ rm ${RM_I} $${catpage} <&3; \
fi; \ fi; \
done done
@echo ">>> Old files removed" @echo ">>> Old files removed"
check-old-files: check-old-files:
@echo ">>> Checking for old files" @echo ">>> Checking for old files"
@for file in ${OLD_FILES} ${OLD_FILES:Musr/share/*.gz:R}; do \ @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
while read file; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
echo "${DESTDIR}/$${file}"; \ echo "${DESTDIR}/$${file}"; \
fi; \ fi; \
@ -1386,24 +1394,29 @@ check-old-files:
while read catpage; do \ while read catpage; do \
read manpage; \ read manpage; \
if [ ! -e "$${manpage}" ]; then \ if [ ! -e "$${manpage}" ]; then \
echo $${catpage} ; \ echo $${catpage}; \
fi; \ fi; \
done done
delete-old-libs: delete-old-libs:
@echo ">>> Removing old libraries" @echo ">>> Removing old libraries"
@echo "${OLD_LIBS_MESSAGE}" | fmt @echo "${OLD_LIBS_MESSAGE}" | fmt
@for file in ${OLD_LIBS}; do \ @exec 3<&0; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-V OLD_LIBS | xargs -n1 | \
while read file; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
rm ${RM_I} "${DESTDIR}/$${file}"; \ rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
fi; \ fi; \
done done
@echo ">>> Old libraries removed" @echo ">>> Old libraries removed"
check-old-libs: check-old-libs:
@echo ">>> Checking for old libraries" @echo ">>> Checking for old libraries"
@for file in ${OLD_LIBS}; do \ @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-V OLD_LIBS | xargs -n1 | \
while read file; do \
if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
echo "${DESTDIR}/$${file}"; \ echo "${DESTDIR}/$${file}"; \
fi; \ fi; \
@ -1411,7 +1424,9 @@ check-old-libs:
delete-old-dirs: delete-old-dirs:
@echo ">>> Removing old directories" @echo ">>> Removing old directories"
@for dir in ${OLD_DIRS}; do \ @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-V OLD_DIRS | xargs -n1 | \
while read dir; do \
if [ -d "${DESTDIR}/$${dir}" ]; then \ if [ -d "${DESTDIR}/$${dir}" ]; then \
rmdir -v "${DESTDIR}/$${dir}" || true; \ rmdir -v "${DESTDIR}/$${dir}" || true; \
elif [ -L "${DESTDIR}/$${dir}" ]; then \ elif [ -L "${DESTDIR}/$${dir}" ]; then \
@ -1422,7 +1437,9 @@ delete-old-dirs:
check-old-dirs: check-old-dirs:
@echo ">>> Checking for old directories" @echo ">>> Checking for old directories"
@for dir in ${OLD_DIRS}; do \ @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-V OLD_DIRS | xargs -n1 | \
while read dir; do \
if [ -d "${DESTDIR}/$${dir}" ]; then \ if [ -d "${DESTDIR}/$${dir}" ]; then \
echo "${DESTDIR}/$${dir}"; \ echo "${DESTDIR}/$${dir}"; \
elif [ -L "${DESTDIR}/$${dir}" ]; then \ elif [ -L "${DESTDIR}/$${dir}" ]; then \