diff options
Diffstat (limited to 'tools/build/depend-cleanup.sh')
| -rwxr-xr-x | tools/build/depend-cleanup.sh | 164 |
1 files changed, 146 insertions, 18 deletions
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 39b06b45d45f..4dfe694d5c0a 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -1,6 +1,5 @@ #!/bin/sh # -# $FreeBSD$ # # Our current make(1)-based approach to dependency tracking cannot cope with # certain source tree changes, including: @@ -17,26 +16,90 @@ # anyone would try a NO_CLEAN build against an object tree from before the # related change. One year should be sufficient. +set -e +set -u + +warn() +{ + echo "$(basename "$0"):" "$@" >&2 +} + +err() +{ + warn "$@" + exit 1 +} + +usage() +{ + echo "usage: $(basename $0) [-v] [-n] objtop" >&2 +} + +VERBOSE= +PRETEND= +while getopts vn o; do + case "$o" in + v) + VERBOSE=1 + ;; + n) + PRETEND=1 + ;; + *) + usage + exit 1 + ;; + esac +done +shift $((OPTIND-1)) + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + OBJTOP=$1 +shift if [ ! -d "$OBJTOP" ]; then - echo "usage: $(basename $0) objtop" >&2 - exit 1 + err "$OBJTOP: Not a directory" fi +if [ -z "${MACHINE+set}" ]; then + err "MACHINE not set" +fi + +if [ -z "${MACHINE_ARCH+set}" ]; then + err "MACHINE_ARCH not set" +fi + +if [ -z "${ALL_libcompats+set}" ]; then + err "ALL_libcompats not set" +fi + +run() +{ + if [ "$VERBOSE" ]; then + echo "$@" + fi + if ! [ "$PRETEND" ]; then + "$@" + fi +} + # $1 directory # $2 source filename w/o extension # $3 source extension clean_dep() { - if [ -e "$OBJTOP"/$1/.depend.$2.pico ] && \ - egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.pico; then \ - echo "Removing stale dependencies and objects for $2.$3"; \ - rm -f \ - "$OBJTOP"/$1/.depend.$2.* \ - "$OBJTOP"/$1/$2.*o \ - "$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 @@ -50,14 +113,17 @@ if [ -e "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o ] && \ 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" - 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 if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \ ! grep -q 'crunched_stub_t' "$OBJTOP"/rescue/rescue/rescue.c; then echo "Removing old rescue(8) tree" - rm -rf "$OBJTOP"/rescue/rescue + run rm -rf "$OBJTOP"/rescue/rescue fi # 20210105 fda7daf06301 pfctl gained its own version of pf_ruleset.c @@ -65,13 +131,16 @@ if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o ] && \ egrep -qw "sys/netpfil/pf/pf_ruleset.c" \ "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o; then echo "Removing old pf_ruleset dependecy file" - rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o + run rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o fi # 20210108 821aa63a0940 non-widechar version of ncurses removed if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then echo "Removing stale ncurses objects" - 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 @@ -83,10 +152,69 @@ clean_dep lib/libc pdfork S if [ -e "$OBJTOP"/lib/libc++/libc++.ld ] && \ fgrep -q "/usr/lib/libc++.so" "$OBJTOP"/lib/libc++/libc++.ld; then echo "Removing old libc++ linker script" - rm -f "$OBJTOP"/lib/libc++/libc++.ld + run rm -f "$OBJTOP"/lib/libc++/libc++.ld fi # 20220326 fbc002cb72d2 move from bcmp.c to bcmp.S if [ "$MACHINE_ARCH" = "amd64" ]; then - clean_dep lib/libc bcmp c + clean_dep lib/libc bcmp c +fi + +# 20220524 68fe988a40ca kqueue_test binary replaced shell script +if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \ + "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.kqtest* >/dev/null 2>&1; then + echo "Removing old kqtest" + run rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ + "$OBJTOP"/tests/sys/kqueue/libkqueue/* +fi + +# 20221115 42d10b1b56f2 move from rs.c to rs.cc +clean_dep usr.bin/rs rs c + +# 20230110 bc42155199b5 usr.sbin/zic/zic -> usr.sbin/zic +if [ -d "$OBJTOP"/usr.sbin/zic/zic ] ; then + echo "Removing old zic directory" + run rm -rf "$OBJTOP"/usr.sbin/zic/zic +fi + +# 20230208 29c5f8bf9a01 move from mkmakefile.c to mkmakefile.cc +clean_dep usr.sbin/config mkmakefile c +# 20230209 83d7ed8af3d9 convert to main.cc and mkoptions.cc +clean_dep usr.sbin/config main c +clean_dep usr.sbin/config mkoptions c + +# 20230401 54579376c05e kqueue1 from syscall to C wrapper +clean_dep lib/libc kqueue1 S + +# 20230623 b077aed33b7b OpenSSL 3.0 update +if [ -f "$OBJTOP"/secure/lib/libcrypto/aria.o ]; then + echo "Removing old OpenSSL 1.1.1 tree" + 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 +clean_dep lib/libc ffs S +clean_dep lib/libc ffsl S +clean_dep lib/libc ffsll S +clean_dep lib/libc fls S +clean_dep lib/libc flsl S +clean_dep lib/libc flsll S + +# 20230815 28f6c2f29280 GoogleTest update +if [ -e "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o ] && \ + grep -q '_ZN7testing8internal18g_linked_ptr_mutexE' "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o; then + echo "Removing stale fusefs GoogleTest objects" + run rm -rf "$OBJTOP"/tests/sys/fs/fusefs +fi + +# 20231031 0527c9bdc718 Remove forward compat ino64 stuff +clean_dep lib/libc fstat c +clean_dep lib/libc fstatat c +clean_dep lib/libc fstatfs c +clean_dep lib/libc getdirentries c +clean_dep lib/libc getfsstat c +clean_dep lib/libc statfs c |