From nobody Fri Jan 2 20:52:07 2026 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 4djbTz5drSz6MFhv for ; Fri, 02 Jan 2026 20:52:07 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTz3KFCz3qbc for ; Fri, 02 Jan 2026 20:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387127; 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=3T6Ebx3GpxNpkZYRAaoS2f8NoHwhFQIZ/NJNGjxYG2A=; b=WRIjlxi2kbyQNdpVYNBVKmLVy28GkJpaDxFSaIXp0Vd6IlJEumZx2cN+bH2SGxA+FdQ57l uqDDFyNKBT1k5z+M59NS20PpPo+AAHAk+6/OAfQQjblCjnLhLHvC/iW2OcUCEWN+ZYh8ZT mtKj17bjBs9rp1EO2cYDBlJKMQ8mHjQXomTMaTp5bu6wgd30SveBNT3ZgEZd203r2+GP6E mtnAH+wkCl97ByMeAAQp7WDCt2ZcugRBjuB1KYRxZVhR5f0UBzrJUJNR1rD5QoERzDtqw9 Q24KtmZex8uyU9IJrzr/CReR+u4x6wFH0SnwN6cqYWzxaBDFwEkF+CpmJd8KBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387127; 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=3T6Ebx3GpxNpkZYRAaoS2f8NoHwhFQIZ/NJNGjxYG2A=; b=HvMTih5GIoQxl2d01589XZZW9tEjyfYh/Hd1uKjPdknhPPsizNR9nsoz7btqdakOsMRW7O 0fkMlC9wBgHZnEw5Q31N8IXWZQQFrAZ9lNrcOVKUmyE+OTSBX1CHLHVt2ri1oh4E5cmTwf gT3EGPTrtabkK1s+4nUM70jfdAOvy2wTBRfUZBTJDypzu3/byUDzZI5e38jj/N/TFV0CCp 3MiM1187HdcyWNTnNfj88qkdJz16NLW9ybDrdtogCn87usxkZ+KkiB5yhG2pvBgsxuQ1Q7 3v2HRCcATVJSdRRB+rzVuXTSdi7pxfrZ6koeroHuEnrUyxwP8lnTp9fLZ2Cq+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387127; a=rsa-sha256; cv=none; b=IoTbIPV84zUXqg5DO52at8ic3ypeS2KZeuWl62CXr3yuI7KP4vVcPhrCZQfTDSMiG6t4Fx GE6RfXZsFHm9h3dr+XCjHAQuko2E41gn3V9kGrA2I1uA7SE3oUiKfP0iu+d15scfTPokq6 B2wxnKZrfzWAIhNWtK5T5y9Hel0MZN9yQi69C4Q2f1N4nJ7aSOn0OrweNLB76b7uxFeHmy xnyW8yi8kDLWyoqBR+KBUtzc1ZMoKsvhn0AwH+jxm7PZ9FN+EIVcg6nGaPg9GUgOi5oCi5 XO30FKxYGHxDz+EkY9OzFcOSJiNzDdjQbLr7mHIhrtPzvf9aSJ6QfsdRR5N7lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djbTz2X0VzZTj for ; Fri, 02 Jan 2026 20:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c027 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 41626383b651 - stable/14 - OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 41626383b651d4229197c2f439d5ff940da025c3 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:07 +0000 Message-Id: <69582ff7.c027.1c31e3ab@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=41626383b651d4229197c2f439d5ff940da025c3 commit 41626383b651d4229197c2f439d5ff940da025c3 Author: Dimitry Andric AuthorDate: 2025-12-24 15:52:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:21 +0000 OptionalObsoleteFiles.inc: fix up WITH_LLVM_LINK_STATIC_LIBRARIES cases In commit cf1eaaf41cef I added the WITH_LLVM_LINK_STATIC_LIBRARIES src.conf(5) build knob, which also affects OptionalObsoleteFiles.inc. However, the checks were incorrect: when WITH_LLVM_LINK_STATIC_LIBRARIES is active, the OLD_LIBS libprivatellvm.so.19, libprivateclang.so.19 and libprivatelldb.so.19 should always be cleaned up. Fixes: cf1eaaf41cef MFC after: 1 week (cherry picked from commit 160077a4d75186a979f28f0778259c66d8cac8be) --- tools/build/mk/OptionalObsoleteFiles.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 1fed797b8f24..8b2688f7e626 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -877,14 +877,14 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz .endif -.if ${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG} == no && ${MK_CLANG_FORMAT} == no && ${MK_LLDB} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivateclang.so.19 .endif -.if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ - ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no && \ - ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if (${MK_CLANG_EXTRAS} == no && ${MK_CLANG} == no && ${MK_LLDB} == no && \ + ${MK_LLD} == no && ${MK_LLVM_BINUTILS} == no && ${MK_LLVM_COV} == no) || \ + ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatellvm.so.19 .endif @@ -3706,7 +3706,7 @@ OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} OLD_FILES+=usr/bin/ld.lld .endif -.if ${MK_LLDB} == no && ${MK_LLVM_LINK_STATIC_LIBRARIES} == no +.if ${MK_LLDB} == no || ${MK_LLVM_LINK_STATIC_LIBRARIES} != no OLD_LIBS+=usr/lib/libprivatelldb.so.19 .endif