From nobody Wed Nov 16 05:19:09 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NBrv16X35z4dFhD; Wed, 16 Nov 2022 05:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NBrv15BTbz3HNG; Wed, 16 Nov 2022 05:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668575949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hangCBajcTEd0tmZag37SiFWF4C0Hb0TotJdWdG5Do=; b=NV8EWgEHsoDUxx4Kv5fwYqsqs9Cw1oc61ySlbY/kLpt0/LRvr0kQaoZdfF7q31niF/pwtU CDHVN5wfFXRrM2m4lBHCgI0oUhCfhW4brzLaPziI4glIlIRFEwsE5XUfB2Q1WQA+fi7fdx 5S+vHtyj4FjUYpG41ApRLt6hOzIYyvfkbakKEXDz0RWiXuPgok1NWkJ6BmWPT9ynKICqD8 ZMIsKQmyUrHYjXhtCzLQqfO8wSrmKCza5YP1rprVZ/u6ZWzHd3FvzJlb2EGbrJDQGSVY8X 57ZfMiCYrLPTC5kF5Fw27ym6qugDCThVzMipi6O8uYqmkoj1iLR9m8Q8cdKBGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668575949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hangCBajcTEd0tmZag37SiFWF4C0Hb0TotJdWdG5Do=; b=yYYRjAztcfPtvvP/N42mqLWhHqiM+n8JmU+n0ANz3ty9+yet5unSIst6GEbw651srQCbUy 06M4vekzNp8F5ait3XxU0Y6/09qcwDLvITvatLEXfm053CHERazI/NHMVMD9FRvfWTZj+b ydZoJeza+LzyNHVg5Docdrxsc2N3DzdslN4rl0wAJ8wniYR17gQb04eZRAF8i/6nDj+OVn /IsQPhwOgUeIx7LXbHC5/8KZ7NxdDCzlgBGhLqGSwcA6PQ40dYrESwPgqtkUViAyfbx/eW D92OPzOyN34j8BgFdew/T0ri2OoQgPyceGJy8bwd8RvDujdZJrq5w/wwabg1oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668575949; a=rsa-sha256; cv=none; b=iSbQDhTR4+yQpvKkh98tfZnKTuoEF38VU560sRQJQoDSdf9wOOTyAk44wLN1hrcU3tgtVU 25nIX5d4DMyhBRj3UKG0DwStZlFRPf8QKbzZZwOBpE3IIUEmE9c0L+j6ZA1DGRlp1049hc AvrTLDxKNX31oP1WNgG7HDf1hBWO8IidYfyxwpQBDOpFOUKKPBHFiyukYryNCI9WcL3vL9 dKiqiFz6QQakCk0kQ4wIMqWqt0nVF/tGM+S0e5Wfj7xF0lcahOuBtbdRxSy3GSAl5PJzIb G7p/3FBURuxrQakwybXomQJKtQl+gdQOi9grdFRdqBCeTL//bpddHGl84uRnrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NBrv14Hrlzpr1; Wed, 16 Nov 2022 05:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AG5J9W4012695; Wed, 16 Nov 2022 05:19:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AG5J99p012694; Wed, 16 Nov 2022 05:19:09 GMT (envelope-from git) Date: Wed, 16 Nov 2022 05:19:09 GMT Message-Id: <202211160519.2AG5J99p012694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 838a06141730 - main - depend-cleanup.sh: Handle rs(1) moving to C++. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 838a061417300678f8604abb9fc6ade8d1bf61b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=838a061417300678f8604abb9fc6ade8d1bf61b8 commit 838a061417300678f8604abb9fc6ade8d1bf61b8 Author: John Baldwin AuthorDate: 2022-11-16 05:17:28 +0000 Commit: John Baldwin CommitDate: 2022-11-16 05:17:28 +0000 depend-cleanup.sh: Handle rs(1) moving to C++. To support changes in filenames for programs (and not just libraries), update clean_dep() to check .depend.foo.o files as well as .depend.foo.pico files. --- tools/build/depend-cleanup.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 35066ee7f921..195162d3efc8 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -37,6 +37,15 @@ clean_dep() "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ "$OBJTOP"/obj-lib32/$1/$2.*o fi + if [ -e "$OBJTOP"/$1/.depend.$2.o ] && \ + egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.o; 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 } # Date Rev Description @@ -98,3 +107,6 @@ if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \ 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