From nobody Sat Jul 22 18:23:13 2023 X-Original-To: dev-commits-src-branches@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 4R7ZYF5RyPz4nt8h; Sat, 22 Jul 2023 18:23:13 +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 4R7ZYF4WFJz3Qfp; Sat, 22 Jul 2023 18:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690050193; 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=kCmri2LmiVI4FZWvFFzi+9NrA3kj9LY6F9CxCIUZ1LM=; b=ezIEqNm+51HiKx+YaQKhackvz2X9V+TSywjo4CUWL+ohyTmMu7s4HSy5boYuci29IhgYgp btOtIkAt8nc9+4g9kuH1T4kvNgtM2bZJlca1N4VR2xAZjiDWHZ+OeUrekJgi5AriLsJ/6t BGkM1ehH/0iCmpis7TsgrV4sMIxQrETCBR0REjT1xHjVn8VYs/Dh1Dl5PTEUkvVMEx2PWy sq0WAetcT90VaFIXRMcSZ9akWEmUAWXcQ/Ai12kXzmeFYWXUZa6s157rrX0dP5BA6X8rX+ O+Gvbz/Sn/i+Qfuar6Oe2qSmtcQMqjgGXKXGk0QgheNY0T7W+i+WZvhn5gi6fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690050193; 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=kCmri2LmiVI4FZWvFFzi+9NrA3kj9LY6F9CxCIUZ1LM=; b=ZHaCAHr6pFHUzlN2aFdEZ9CQCb/KELL80gcnmUdhsRSzt58Ky1+8fHigIQa0RCHIplN5vv 5aIJDsmYPSYjMINlWksh5f+SZnLhz6xhV5LiQzuUc81Z54lawaTVXJ/mgxs1JGqb/S1hEX xIR5p+ro5Vd81uNp/Q9VMyobPeLNdFMjk/kUuf8wT/g137L6+vpd6eH4LvvG5EzYzCIDm/ mKVcyR1keZImVgsOdF8Wq4Y/LrRiDBbOvx6wadO0JV+FdXiHPchzlr+K7Bm854nDDKKTvn AfXtI6KvvZyfRDykQArIN9Zth+lQQ8ncWFMiolvnsf2yGOOKtE3wJ7JsgX6wBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690050193; a=rsa-sha256; cv=none; b=xZDDPeoQYjyXLfvtvHU/w2qOkn737s1UVTw3z1O2o4QFQmR3S4Tkww0q6Tu2QLleqNp4XX Dizf1ZyrYXe+wHQLckLI+GJXb3WWaWqV/wPLDAYBIQKQarLHnRz4pBxHivf0xZyHZoH3vX lBmhWZci6/j7+hIvKtE9LXxqQgWDp5ieDFVKdQYmzTbjS6WVq6oZw5WdyUQYHCJqd1eZy8 5oGKu8HK82IU4/IWbLqpYXRP0RB/eqbd6z3cHmSNO1s1f0bHsh3bsj7rmsn2fat9DMg0wn ZN/ATn/tAGeNe6Z4wYMfWgdYa9yqVmHsPnuTsjnyE9bLrDdaHxUGNc4E1qJ5SA== 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 4R7ZYF2mfGz14fp; Sat, 22 Jul 2023 18:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36MINDf1075367; Sat, 22 Jul 2023 18:23:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36MIND9w075366; Sat, 22 Jul 2023 18:23:13 GMT (envelope-from git) Date: Sat, 22 Jul 2023 18:23:13 GMT Message-Id: <202307221823.36MIND9w075366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 50a4d8b34570 - stable/13 - depend-cleanup.sh: handle 32-bit dependencies having no 64-bit equivalent List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 50a4d8b345705ff2180c150903228f99b08b5674 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=50a4d8b345705ff2180c150903228f99b08b5674 commit 50a4d8b345705ff2180c150903228f99b08b5674 Author: Dimitry Andric AuthorDate: 2023-07-10 22:50:09 +0000 Commit: Dimitry Andric CommitDate: 2023-07-22 18:22:34 +0000 depend-cleanup.sh: handle 32-bit dependencies having no 64-bit equivalent For example with the recent removal of ffs.S for 32-bit arm and i386, the egrep in clean_dep() did not find any files to remove, even if you added a "clean_dep lib/libc ffs S" line. This is because it will never find the ffs.S filename in the 64-bit .depend files for libc. Split the searching and removing of 32-bit dependencies and objects into a separate part to cope with this. This can be used similarly later on, for other bitnesses. MFC after: 3 days (cherry picked from commit 7ba8cc9b7b6bdea142d7ecb82c7d3a9b095e967d) --- tools/build/depend-cleanup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 58a7c72b2082..92a085067c2b 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -33,7 +33,11 @@ clean_dep() echo "Removing stale dependencies and objects for $2.$3"; \ rm -f \ "$OBJTOP"/$1/.depend.$2.* \ - "$OBJTOP"/$1/$2.*o \ + "$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" + rm -f \ "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ "$OBJTOP"/obj-lib32/$1/$2.*o fi