Page MenuHomeFreeBSD
Files F147377217

D41187.id.diff
No OneTemporary
Actions

D41187.id.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1026,6 +1026,7 @@
_cleanobj_fast_depend_hack: .PHONY
@echo ">>> Deleting stale dependencies...";
MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \
+ ALL_libcompats=${_ALL_libcompats:Q} \
sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP}
_worldtmp: .PHONY
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -73,6 +73,10 @@
err "MACHINE_ARCH not set"
fi
+if [ -z "${ALL_libcompats+set}" ]; then
+ err "ALL_libcompats not set"
+fi
+
run()
{
if [ "$VERBOSE" ]; then
@@ -88,18 +92,15 @@
# $3 source extension
clean_dep()
{
- if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then
- echo "Removing stale dependencies and objects for $2.$3"
- run rm -f \
- "$OBJTOP"/$1/.depend.$2.* \
- "$OBJTOP"/$1/$2.*o
- fi
- if egrep -qw "$2\.$3" "$OBJTOP"/obj-lib32/$1/.depend.$2.*o 2>/dev/null; then
- echo "Removing 32-bit stale dependencies and objects for $2.$3"
- run rm -f \
- "$OBJTOP"/obj-lib32/$1/.depend.$2.* \
- "$OBJTOP"/obj-lib32/$1/$2.*o
- fi
+ for libcompat in "" $ALL_libcompats; do
+ dirprfx=${libcompat:+obj-lib${libcompat}/}
+ if egrep -qw "$2\.$3" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then
+ echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3"
+ run rm -f \
+ "$OBJTOP"/$dirprfx$1/.depend.$2.* \
+ "$OBJTOP"/$dirprfx$1/$2.*o
+ fi
+ done
}
# Date Rev Description
@@ -113,7 +114,10 @@
egrep -qw "cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c" \
"$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o; then
echo "Removing old ZFS tree"
- run rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl
+ for libcompat in "" $ALL_libcompats; do
+ dirprfx=${libcompat:+obj-lib${libcompat}/}
+ run rm -rf "$OBJTOP"/${dirprfx}cddl
+ done
fi
# 20200916 WARNS bumped, need bootstrapped crunchgen stubs
@@ -134,7 +138,10 @@
# 20210108 821aa63a0940 non-widechar version of ncurses removed
if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then
echo "Removing stale ncurses objects"
- run rm -rf "$OBJTOP"/lib/ncurses "$OBJTOP"/obj-lib32/lib/ncurses
+ for libcompat in "" $ALL_libcompats; do
+ dirprfx=${libcompat:+obj-lib${libcompat}/}
+ run rm -rf "$OBJTOP"/${dirprfx}lib/ncurses
+ done
fi
# 20210608 f20893853e8e move from atomic.S to atomic.c
@@ -183,10 +190,11 @@
# 20230623 b077aed33b7b OpenSSL 3.0 update
if [ -f "$OBJTOP"/secure/lib/libcrypto/aria.o ]; then
echo "Removing old OpenSSL 1.1.1 tree"
- run rm -rf "$OBJTOP"/secure/lib/libcrypto \
- "$OBJTOP"/secure/lib/libssl \
- "$OBJTOP"/obj-lib32/secure/lib/libcrypto \
- "$OBJTOP"/obj-lib32/secure/lib/libssl
+ for libcompat in "" $ALL_libcompats; do
+ dirprfx=${libcompat:+obj-lib${libcompat}/}
+ run rm -rf "$OBJTOP"/${dirprfx}secure/lib/libcrypto \
+ "$OBJTOP"/${dirprfx}secure/lib/libssl
+ done
fi
# 20230714 ee8b0c436d72 replace ffs/fls implementations with clang builtins

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 11, 11:25 AM (19 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29537427
Default Alt Text
D41187.id.diff (3 KB)

Event Timeline