From nobody Tue Sep 12 12:23:53 2023 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 4RlN6f16Qwz4sTQl; Tue, 12 Sep 2023 12:23:54 +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 4RlN6f0gr9z3ZLn; Tue, 12 Sep 2023 12:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694521434; 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=/ZjqybK4szpUzBQzDFuSAth0Q4JngH5T5bQUPB9Wyx0=; b=UO+WD7jnUGzp2o06o4thX8YGwNuYlAgrYow35DBRCpTJCbQIcSTk+3tKEWbjdMerS3cwHD TT56Y0OKWIFUKG/DKrj12Nfuk7c+Lzi6e77ynK04Pb2aYeIW3Q5m4rv3bnvIxcXpViY8ST Xl91AvtlW5hYP8YvVaKrRuL8r27ODmAclC0BELSsGZQdtFmGflykhIhXlxKQ11zorS14o3 f4YmEIZy+7hIihMU2TOBpeQAhPhpyPpDsYK/Z2JwvrSF4y9+jshDkz23VFC2yc1A4RKWbL PB9xAuVu0XSr9wkCTtDBO8vwkkXpiXyH/bIsgMP65EOamTQvw8E2B1dXLKYP0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694521434; a=rsa-sha256; cv=none; b=ltiTOe3Oh80Meb9yPyW1e8oIxa2G0iEhEdfFP8MF2ke940a6VjFbAnBnBdl5TN5g8dFsGZ vHNh1jQTPveshjzl/A/6f3bFnh75zIl6wyWga66Lg5H2Cs44N3aYAUXboZz1LZkP0G+Xzi 3UTyo8sTxVQ/oz0O5Cyrf7KCdVX9ya2B3NOFZc5v1GQB4Et17Tw9xn+3Sr38QSRS9ENKpA UsjoKfKmJaEeZofFe/A7kLDhyYNnpnpCtbGCTmN4o8aOdIXgu93MrBhe1MBlbKPWrA/21y vD5t4bRH2UdpZfMN3fO5+w6wyfCMZ1tjQwcSvzHsb670MrWt/c3Q3yPjJ5LOYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694521434; 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=/ZjqybK4szpUzBQzDFuSAth0Q4JngH5T5bQUPB9Wyx0=; b=NoesS6buZjRqDXomv+SHglo/o7L+s2kIK1r1LV+pFmN6IxltegbEMtJixprAHqdJIE1voL Ir1vXm0bSccAn604a0YK9MvcORL5NWdej00GnYxlZRSdMX4vjH4m4OYU9LaN6Ttij3i8NQ wdZQowhOSyt4mkn2v5W0tkSS8QXaMMSU046PQ3hKwOYKJR/yA43SSzUREbOrP4LTf9p/46 XzML6avzGaILhkZQQ/XURNeqAjh70QkAUXcKYW7Tr7DmPLfcAcu5VELhkMj8P69yfgFBmt nwi2ZgyxgYL1JjReQBl1OCHtM63iuHHmpX6TY/oeBJCO8UcOdM5WAr2n4XUWrg== 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 4RlN6d6s6HzXJv; Tue, 12 Sep 2023 12:23:53 +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 38CCNrXo037226; Tue, 12 Sep 2023 12:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CCNrAO037223; Tue, 12 Sep 2023 12:23:53 GMT (envelope-from git) Date: Tue, 12 Sep 2023 12:23:53 GMT Message-Id: <202309121223.38CCNrAO037223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 78847e1e5927 - main - pkgbase: Move headers and libs out of runtime and utilities 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: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78847e1e592789dc85bddf4d2f1d9a8ce4614ff1 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=78847e1e592789dc85bddf4d2f1d9a8ce4614ff1 commit 78847e1e592789dc85bddf4d2f1d9a8ce4614ff1 Author: Doug Rabson AuthorDate: 2023-09-11 08:38:46 +0000 Commit: Doug Rabson CommitDate: 2023-09-12 12:22:21 +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 --- 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 bc1cfd96dfc9..736a47854534 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 de3fec3f0ca7..fa13e8e334d2 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.