From nobody Sun Sep 25 19:33:55 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 4MbGKH4Fp4z4cm1J; Sun, 25 Sep 2022 19:33:55 +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 4MbGKH3d2Vz3QNX; Sun, 25 Sep 2022 19:33:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664134435; 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=9YPHtABeLG6l1xFEr3U55i0uffui8yB8CJ205N5UXjs=; b=Aq6ujk69KWxx9H69dudAsymtAT5Xt/g2Dkpn0W7GE/bG9DTHeR4EEc+Zl+EHUZZKQpEr8g EhHlXXMUIvq1F/pQ+9eSaIn7nt62A//TjIz+svbGBNNxsxHUR3VH6tyHTCsRiD8newk+iH lr/mga4xobTAKWUk5HP2kYjsYdktynSFIGewNRAL3uyGB7BxDLrr4EChuRE1JHn6j9uDMH VLcwFBtej/JsBf3L64h2Q4v/d/caa0dDV5VughkY+vsFBMSZkHnAwLEfTYrz8ZXKAqDO6K phQgJ3xJQKSt/QA/XsLvCMr9S7yx4kgY1nrESivP5lRmZHqYVioTXewwJXM80A== 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 4MbGKH2gZ7zXFb; Sun, 25 Sep 2022 19:33:55 +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 28PJXtvS054919; Sun, 25 Sep 2022 19:33:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PJXtgZ054918; Sun, 25 Sep 2022 19:33:55 GMT (envelope-from git) Date: Sun, 25 Sep 2022 19:33:55 GMT Message-Id: <202209251933.28PJXtgZ054918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d1a351be19d4 - main - Do not delete objdump when WITH_LLVM_BINUTILS is true 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1a351be19d4bd03918d44ea33fa7c09655f810a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664134435; 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=9YPHtABeLG6l1xFEr3U55i0uffui8yB8CJ205N5UXjs=; b=Iow+2Zg39omaTWwtwkwdmFk8t5534rMbSiKahYgAaJB03GFLPirPQ9n7hASVwAPz11uioY MNCXwaOGEh7zzKfCE0CmcHltlrYBoKZNv2x7tmCEgDnEmNi6rbxcQF/CxwIFuSs9ZgsF30 xlH9UudUGWtDrDBzQ2Y+EAjw+Xk+He/Ec4LwZo3b4zaXhriSqAYs33WOyBvPjFjP0ng4ah VSmeiQN4/JUdjfFPxN2FXEHdC1WOX5QuI6RatHdTMYD3pIjMgnuPUoKZrgF5vrwzXrwIKz knk/BjMnANIJWNsPAxRuWhS/mXHxaTWUnHgsf+eupfE94bxdan6acRuStVlAGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664134435; a=rsa-sha256; cv=none; b=cvY8/UCPDRGybKDUIuYCzpbtKGQhH/ohEMh3lwn7WDauRW0OijCPbDgTjVg7xX/UB7lCZ0 6BH8FMOu5iRvoEATd7NPUeiYIpZDJog90TiXXPvLBCUkdEzpWr14QG+WUG12F78/SuHRw/ J64eJqSa4CvVHft/j3hhI/7Yw7i1sgito11NLqgbfQ5r9nSHJcOZi6ypGUknax4xMZ40hf 5ygpFikyUgM5KZFBRRvKFIA4OSIG9Oo9uJQnRd3K5WA3dzrReEi82gMXnpBWbAUBHLKcNo qr5xn/Gz4wxWA+BsMPu5qUNnRkogqFhOj0Rcxx0cX9h4CqlWeCNtnhrngBxW/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d1a351be19d4bd03918d44ea33fa7c09655f810a commit d1a351be19d4bd03918d44ea33fa7c09655f810a Author: Ed Maste AuthorDate: 2022-09-25 19:29:38 +0000 Commit: Ed Maste CommitDate: 2022-09-25 19:33:16 +0000 Do not delete objdump when WITH_LLVM_BINUTILS is true WITH_LLVM_BINUTILS links /usr/bin/objdump to llvm-objdump, and similarly for the man page. Do not delete them in `make delete-old`. PR: 266603 Sponsored by: The FreeBSD Foundation --- ObsoleteFiles.inc | 4 ---- tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5525a3d66caa..2056b4296a94 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -6435,10 +6435,6 @@ OLD_FILES+=usr/include/crypto/skipjack.h # 20200511: Remove ubsec(4) OLD_FILES+=usr/share/man/man4/ubsec.4.gz -# 20200506: GNU objdump 2.17.50 retired -OLD_FILES+=usr/bin/objdump -OLD_FILES+=usr/share/man/man1/objdump.1.gz - # 20200428: route_var.h moved to net/route OLD_FILES+=usr/include/net/route_var.h diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c60663572a27..1bcc0d2d80bc 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2097,6 +2097,11 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif +.if ${MK_LLVM_BINUTILS} == no +OLD_FILES+=usr/bin/objdump +OLD_FILES+=usr/share/man/man1/objdump.1.gz +.endif + .if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz