From nobody Tue Jan 23 23:33:06 2024 X-Original-To: dev-commits-ports-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 4TKNgQ4YhXz58PPd; Tue, 23 Jan 2024 23:33:06 +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 4TKNgQ42YHz40PZ; Tue, 23 Jan 2024 23:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706052786; 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=zJPumChkDKEblgmcPgTiCSdwxl1OiXar8A+1POwod3I=; b=mYPpRm2G9T2l1r7+aD0MtAFwYMhqWv8dn7WwQptQgMysaaqxKR6dwcrz9AZHOY8OEzxKKv sjKnpAddsNgz0DHvSeFiirKnZ+c8wOJ/TEJPLMlVidTc+dmKYY+TAF3tWsqeFo7XN4Lo6R J19M4q1yClwiz5k3dMpMi5ibrtixODnq/EvVCyvPoF3r5rPmM80lLclR7nCbftL6K9Owlh 4ZcngatGtUiwfTgBebI3aMG1aJRMXvzd/AhcS3HRexw6kvxEHc1YxjNXpSf4klYAvFpFpv RcCjb7VIYQrc5lJ49CV9mL32GORBYnv+wd4DJ63GPktXbB3Y3Nu4UoEyyRsxPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706052786; 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=zJPumChkDKEblgmcPgTiCSdwxl1OiXar8A+1POwod3I=; b=DeK3BsBbmzST6/VUP7A4fF9/RTRUZQUFrfeOsVOLOQ2LVouIca7Bi8yTamjw9b9mQZkELx unXgNBC01IDRiNi52NPg7LQc2s9XrfSH6CaV5TNoN5+sUKxwDyUHCzy0udLzd1wOEjw5aK 1yoH+X3u3Tq3X3+oY0+0dIAF/3BN2nJ2FLMv3mYEt0eY+dgm/RRRQEDbXbsfduEh8nXnpP r4lnyO8vwTsx6h7BU6tjSJTRJWXMfkcG040cDfhVC5wYcdux/ZmUf0ObXMWes7/FT2lxB2 lfd9+TKlBGF1F2yz4wzcgp3ZA9QqES4xxrc/j9idzkfCjLGv1U9V1OvbxifQOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706052786; a=rsa-sha256; cv=none; b=GLBJZimwiTOzlwoN3PnYfC5Oj7BJaKtxow1wi9Bx6Cz75yo2qQ6iA09ePFEAWeaWsKAy9+ smHo0Co35UngS9vywxgxhXthAen9DoJvpwT6XG0A4X0coH6O9r4bwNqqzVnGSi7kan/pbh TY6XGqLkn7qPdSGKVr0CEDi1qfMYHYOjhV//xCMGs1D1iJ0Ynew0Cyh/FplhObTTse7/go G0NGSbAwK1B4LP1bWeY0682fzRfwCi2vWzCmmCWBMC8fREYgXmj3ODkVAebqdRJWRn8uY6 WR4dzIEybHRD9HRcTGozC/IuctCtQpcx/sA5JCAUEQuR/MvOxYHmtLYw9UfixQ== 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 4TKNgQ362Xzr5x; Tue, 23 Jan 2024 23:33:06 +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 40NNX63c068251; Tue, 23 Jan 2024 23:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NNX6jg068248; Tue, 23 Jan 2024 23:33:06 GMT (envelope-from git) Date: Tue, 23 Jan 2024 23:33:06 GMT Message-Id: <202401232333.40NNX6jg068248@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: e96c049f2810 - main - devel/llvm-{cheri,cheriot,morello}: XTOOLCHAIN option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e96c049f2810240608054d7821d1debaf4a16698 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=e96c049f2810240608054d7821d1debaf4a16698 commit e96c049f2810240608054d7821d1debaf4a16698 Author: Brooks Davis AuthorDate: 2024-01-23 23:30:34 +0000 Commit: Brooks Davis CommitDate: 2024-01-23 23:30:34 +0000 devel/llvm-{cheri,cheriot,morello}: XTOOLCHAIN option Make the cross toolchain file optional and disable it completely for cheriot where the compiler targets an architecture we'll ever support (RV32E). --- devel/llvm-cheri/Makefile | 19 +++++++++++-------- devel/llvm-cheriot/Makefile | 2 ++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index dd5e4588cd6a..92cc81b45ad6 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -69,8 +69,8 @@ GH_TAGNAME= ${LLVM_COMMIT} .sinclude "${.PARSEDIR}/Makefile.snapshot" .endif -OPTIONS_DEFINE= CLANG DOCS LIT LLD STATIC_LIBS -OPTIONS_DEFAULT= CLANG LIT LLD +OPTIONS_DEFINE= CLANG DOCS LIT LLD STATIC_LIBS XTOOLCHAIN +OPTIONS_DEFAULT= CLANG LIT LLD XTOOLCHAIN OPTIONS_SUB= yes CLANG_DESC= Build clang @@ -78,8 +78,6 @@ CLANG_PORTDOCS= clang CLANG_USES= perl5 # scan-build does require, but users can install it manually. CLANG_USE= PERL5=build -PLIST_FILES+= share/toolchains/llvm${LLVM_SUFFIX}.mk -SUB_FILES+= xtoolchain.mk DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ @@ -95,6 +93,9 @@ LLD_DESC= Install lld linker LLD_PORTDOCS= lld LLDB_DESC= Install lldb, the LLVM debugger LLDB_BUILD_DEPENDS= swig:devel/swig +XTOOLCHAIN_DESC= Install cross toolchain file +XTOOLCHAIN_PLIST_FILES+=share/toolchains/llvm${LLVM_SUFFIX}.mk +XTOOLCHAIN_SUB_FILES+= xtoolchain.mk STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers) LLVM_TARGETS?= AArch64;ARM;PowerPC;RISCV;X86 @@ -171,9 +172,6 @@ post-patch-LLD-on: ${PATCH_WRKSRC}/lld/docs/conf.py post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ - ${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ - ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} @@ -220,6 +218,11 @@ post-install-LLDB-on: ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib .endif +post-install-XTOOLCHAIN-on: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains + ${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ + ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk + post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp diff --git a/devel/llvm-cheriot/Makefile b/devel/llvm-cheriot/Makefile index ff1635c3cb02..9bcbbf066e25 100644 --- a/devel/llvm-cheriot/Makefile +++ b/devel/llvm-cheriot/Makefile @@ -9,6 +9,8 @@ DISTINFO_FILE= ${.CURDIR}/distinfo DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist +OPTIONS_EXCLUDE= XTOOLCHAIN + LLVM_TARGETS= RISCV CMAKE_FLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=riscv32-unknown-unknown