git: 7970815be40b - main - llvm: Move libprivatelldb to the lldb package

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=7970815be40b1fa604a6554f5ee0f95f834454b5

commit 7970815be40b1fa604a6554f5ee0f95f834454b5
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2026-04-28 19:38:36 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2026-04-28 19:50:42 +0000

    llvm: Move libprivatelldb to the lldb package
    
    Set PACKAGE=lldb in lldb.pre.mk rather than in individual Makefiles;
    change lib/clang/Makefile.inc from PACKAGE=clang to PACKAGE?=clang to
    avoid overwriting it.
    
    This is safe to MFC to stable/15 since the moved library will be
    picked up automatically by pkg.
    
    MFC after:      2 weeks
    Reviewed by:    emaste
    Sponsored by:   https://www.patreon.com/bsdivy
    Differential Revision:  https://reviews.freebsd.org/D56674
---
 lib/clang/Makefile.inc             | 2 +-
 lib/clang/liblldb/Makefile         | 1 -
 lib/clang/lldb.pre.mk              | 2 ++
 usr.bin/clang/lldb-server/Makefile | 1 -
 usr.bin/clang/lldb/Makefile        | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc
index 3678060fdec0..0b18c1e7410e 100644
--- a/lib/clang/Makefile.inc
+++ b/lib/clang/Makefile.inc
@@ -1,6 +1,6 @@
 .include <src.opts.mk>
 
-PACKAGE=	clang
+PACKAGE?=	clang
 MK_PIE:=	no	# Explicit libXXX.a references
 
 .if ${MK_LLVM_FULL_DEBUGINFO} == "no"
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index 95230b8c11b6..5a0b60043ea0 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -6,7 +6,6 @@
 LIB=		lldb
 INTERNALLIB=
 .else
-PACKAGE=	lldb
 SHLIB_CXX=	lldb
 SHLIB_MAJOR=	21
 PRIVATELIB=
diff --git a/lib/clang/lldb.pre.mk b/lib/clang/lldb.pre.mk
index 0c90eb2ffd32..af4ffede39da 100644
--- a/lib/clang/lldb.pre.mk
+++ b/lib/clang/lldb.pre.mk
@@ -1,4 +1,6 @@
 
 .include "clang.pre.mk"
 
+PACKAGE=	lldb
+
 LLDB_SRCS=	${LLVM_BASE}/lldb
diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile
index 37dae6200669..2fc63a20628e 100644
--- a/usr.bin/clang/lldb-server/Makefile
+++ b/usr.bin/clang/lldb-server/Makefile
@@ -1,6 +1,5 @@
 .include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
-PACKAGE=	lldb
 PROG_CXX=	lldb-server
 
 CFLAGS+=	-I${LLDB_SRCS}/include
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 880d4de1c8fc..c28904233e34 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -1,6 +1,5 @@
 .include "${SRCTOP}/lib/clang/lldb.pre.mk"
 
-PACKAGE=	lldb
 PROG_CXX=	lldb
 
 CFLAGS+=	-I${LLDB_SRCS}/include