From nobody Sun Nov 12 11:31:16 2023 X-Original-To: dev-commits-src-all@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 4SSr3n1cJgz50KxK; Sun, 12 Nov 2023 11:31:17 +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 4SSr3n10DDz3VMG; Sun, 12 Nov 2023 11:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699788677; 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=M8CI2lKN5MgU4y02dzG4MsTNU3UTtbYCIhZuB0rOBuU=; b=ZGZA94Shd1QrZoXhw3J2QTZcDLSQMoXAPEKMnpVBPGS39Gb8G3d5T5+UMG6Q+r/EztgjOz QXiT0Bu7YA1qPs9JtcGlUwk3IOhLzYkyuNlAsnqMDV+MFaRW4CxujEmWO/6Wy8jogMac6N 8fpkE2+Nh5AECYLwNk1pJTDtmCe35zIkoFEdgkiW38ulo2shswKsIppfBPlaJHcW4nX7cP ic8Zxp3Swq5sJPaR/xXNzW9MwVFWYsVBfx27OCH3qAGrLht4f3mO+b+q66vhmZ1Xmgl/Kk dh4NO8T/XYRPHmYpBRWhibFQS1fi+UNDNRBlC+3CuYkuUZcb67gUV4TeQ0200w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699788677; 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=M8CI2lKN5MgU4y02dzG4MsTNU3UTtbYCIhZuB0rOBuU=; b=mqpKkTxGxIk0VFDn3tomlhqEWdirdvXQc0Vo/lfpQowjOfMB758eQbZGOEDERnhsDCYJwe LFeeteeWpSJ5PfydM4Jln/BBBPZBy3cIESYmaK4J81JgW68yZ3pP1BkQi3FVQteK3IqZBU T76Xk8v78vkq8F0Edr8QKY8Iq56jMk59S1KMNnwWwcRvk5Lj5csg0iIoFY/0LIcCFVnjoE neHwCG9D0SAfBj/sqagiiCrnYisVMGdzpo9enChurb/+z6Vcd4m26rlXiI7Cp46gO0cIwj GCoZ2RWqETVmKZniwxaehBZltx2ZLfPlqtf3JuAyeCkDMDqF6ZMrSmEz/wPrWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699788677; a=rsa-sha256; cv=none; b=Rz4gUVQedcmjK7BSfBCXtrBvLN63fA9rYN8n0qQdjUeJMQc+fs9X8XkWbN6olDoZ2chAHp WFPqZpppH3GIV5od7h9jA9x5kiuKSnMEWF4F4P6lETarSTCVPG8mIxP2OvraEzhG4BagdO 6j9NzFYTW0mNJYbaH1Y+rBHnhkrLvKkNFM+OWEoUggjWl9Pm05rgGlHXathWFU684M11AX HBXCWwUIxpLn6yPQ7m6AEyg3Gm3B/3t4RJouy66OAn8snwReLq8XszNCH5EHd4t8vK2s47 XIKS4HQ8Il5jEDbd+7aJlXcWm91/LGqLdwWe3jYU8CqyeRbF61P77hexu1PTQA== 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 4SSr3m6z28z6D5; Sun, 12 Nov 2023 11:31:16 +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 3ACBVGgd070789; Sun, 12 Nov 2023 11:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ACBVGZf070786; Sun, 12 Nov 2023 11:31:16 GMT (envelope-from git) Date: Sun, 12 Nov 2023 11:31:16 GMT Message-Id: <202311121131.3ACBVGZf070786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: e968616046a3 - stable/14 - pkgbase: Move headers and libs out of runtime and utilities List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e968616046a32e4ac7b98b2aa7935c3a64f66ada Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=e968616046a32e4ac7b98b2aa7935c3a64f66ada commit e968616046a32e4ac7b98b2aa7935c3a64f66ada Author: Doug Rabson AuthorDate: 2023-09-11 08:38:46 +0000 Commit: Doug Rabson CommitDate: 2023-11-12 10:37:16 +0000 pkgbase: Move headers and libs out of runtime and utilities Headers from src/include were in the runtime-dev package but subdirectories of src/include ended up in utilities-dev by default. Neither package is a good choice - the headers in src/include are not useful without the libraries contained in clibs-dev. This moves the standard C headers to clibs-dev (C++ headers are already in this package). While working on this, I found that various clang libraries and headers were also bundled into utilities-dev by default so these are also moved to clang-dev. I also added a FreeBSD-build-essential meta package to make it simple to install all the toolchain parts. PR: 254173 Reviewed byb: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41815 (cherry picked from commit 78847e1e592789dc85bddf4d2f1d9a8ce4614ff1) --- include/Makefile | 2 +- include/Makefile.inc | 2 ++ lib/clang/Makefile.inc | 1 + lib/csu/Makefile.inc | 1 + lib/libclang_rt/Makefile.inc | 1 + release/packages/generate-ucl.sh | 3 +++ 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/Makefile b/include/Makefile index d8cdbfed3663..f5985ebf091a 100644 --- a/include/Makefile +++ b/include/Makefile @@ -4,7 +4,7 @@ .include -PACKAGE=runtime +PACKAGE=clibs CLEANFILES= osreldate.h version SUBDIR= arpa protocols rpcsvc rpc xlocale .if ${MACHINE_CPUARCH} == "amd64" diff --git a/include/Makefile.inc b/include/Makefile.inc new file mode 100644 index 000000000000..14d7bf96e6bc --- /dev/null +++ b/include/Makefile.inc @@ -0,0 +1,2 @@ +# Make sure all our subdirectory headers end up in clibs-dev +PACKAGE=clibs diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc index 0a2ae8f6b802..2dfc966726b0 100644 --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -1,6 +1,7 @@ .include +PACKAGE= clang MK_PIE:= no # Explicit libXXX.a references .if ${COMPILER_TYPE} == "clang" diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index faf01b293b92..55aaf589f48f 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -1,3 +1,4 @@ +PACKAGE= clibs-dev NO_WMISSING_VARIABLE_DECLARATIONS= # Can't instrument these files since that breaks non-sanitized programs. diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index 4832815643ae..263d1e340f3d 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -1,6 +1,7 @@ .include +PACKAGE= clang CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt .include "compiler-rt-vars.mk" diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index aef08e50c037..9e9680559428 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -44,6 +44,9 @@ main() { certctl) pkgdeps="caroot openssl" ;; + clang) + pkgdeps="lld clang-dev libcompiler_rt-dev" + ;; # -dev packages that have no corresponding non-dev package # as a dependency.