From owner-svn-ports-all@freebsd.org Mon Oct 19 23:06:03 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 28AC0437821; Mon, 19 Oct 2020 23:06:03 +0000 (UTC) (envelope-from brooks@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CFXRv0Gpvz4K9L; Mon, 19 Oct 2020 23:06:03 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1874B531; Mon, 19 Oct 2020 23:06:02 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09JN62an072676; Mon, 19 Oct 2020 23:06:02 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09JN61Xw072669; Mon, 19 Oct 2020 23:06:01 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202010192306.09JN61Xw072669@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 19 Oct 2020 23:06:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552775 - head/devel/llvm-cheri X-SVN-Group: ports-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/devel/llvm-cheri X-SVN-Commit-Revision: 552775 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 23:06:03 -0000 Author: brooks Date: Mon Oct 19 23:06:01 2020 New Revision: 552775 URL: https://svnweb.freebsd.org/changeset/ports/552775 Log: New snapshot and infrastructure updates Reduce the number of targets built to CHERI targets (RISC-V and Mips) and plausable host targets (AArch64 and X86). Allow this port to be used as a master port by an port in an overlay. That is mostly allowing certain variables to be overridden plus using .PARSEDIR to find llvm-devel's license files. Modified: head/devel/llvm-cheri/Makefile head/devel/llvm-cheri/Makefile.snapshot head/devel/llvm-cheri/distinfo head/devel/llvm-cheri/pkg-descr head/devel/llvm-cheri/pkg-plist Modified: head/devel/llvm-cheri/Makefile ============================================================================== --- head/devel/llvm-cheri/Makefile Mon Oct 19 22:20:33 2020 (r552774) +++ head/devel/llvm-cheri/Makefile Mon Oct 19 23:06:01 2020 (r552775) @@ -7,10 +7,10 @@ CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} MAINTAINER= brooks@FreeBSD.org -COMMENT= LLVM and Clang with support for the CHERI architecture +COMMENT?= LLVM and Clang with support for the CHERI architecture LICENSE_DIR= ${WRKSRC}/llvm -.include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" +.include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE" LICENSE:= ${LICENSE:NARM} LICENSE+= LLVM2 LICENSE_FILE_LLVM2= ${LICENSE_DIR}/LICENSE.TXT @@ -47,17 +47,19 @@ SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${ CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_SOURCE_PATH= ${WRKSRC}/llvm CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON -CMAKEARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=cheri-unknown-freebsd CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF +CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS}" +.ifndef MASTERDIR USE_GITHUB= yes GH_PROJECT= llvm-project GH_ACCOUNT= CTSRD-CHERI GH_TAGNAME= ${LLVM_COMMIT} +.endif -.include "Makefile.snapshot" +.sinclude "${.CURDIR}/Makefile.snapshot" OPTIONS_DEFINE= CLANG DOCS LIT LLD OPTIONS_DEFAULT= CLANG LIT LLD @@ -81,6 +83,8 @@ LLD_DESC= Install lld linker LLD_PORTDOCS= lld LLDB_DESC= Install lldb, the LLVM debugger (ignore on 9.x) LLDB_BUILD_DEPENDS= swig:devel/swig + +LLVM_TARGETS?= AArch64;Mips;RISCV;X86 PLIST_SUB+= COMMAND_SUFFIX=${COMMAND_SUFFIX} \ LLVM_MAJOR=${LLVM_MAJOR} \ Modified: head/devel/llvm-cheri/Makefile.snapshot ============================================================================== --- head/devel/llvm-cheri/Makefile.snapshot Mon Oct 19 22:20:33 2020 (r552774) +++ head/devel/llvm-cheri/Makefile.snapshot Mon Oct 19 23:06:01 2020 (r552775) @@ -6,6 +6,6 @@ # LLVM_MAJOR= 11 LLVM_RELEASE= ${LLVM_MAJOR}.0.0 -SNAPDATE= 20201009 +SNAPDATE= 20201018 -LLVM_COMMIT= 21253287dd87f89230667d8663a3cfd01e4cb368 +LLVM_COMMIT= bec478d1d2a9aaeabe963c50d378411b7c1e089f Modified: head/devel/llvm-cheri/distinfo ============================================================================== --- head/devel/llvm-cheri/distinfo Mon Oct 19 22:20:33 2020 (r552774) +++ head/devel/llvm-cheri/distinfo Mon Oct 19 23:06:01 2020 (r552775) @@ -1,3 +1,3 @@ -TIMESTAMP = 1602283032 -SHA256 (CTSRD-CHERI-llvm-project-11.0.d20201009-21253287dd87f89230667d8663a3cfd01e4cb368_GH0.tar.gz) = 8d6fa00f3aa5aef0a3c178833938c9c614867595851e2538314f2acd68c04717 -SIZE (CTSRD-CHERI-llvm-project-11.0.d20201009-21253287dd87f89230667d8663a3cfd01e4cb368_GH0.tar.gz) = 127604164 +TIMESTAMP = 1603143226 +SHA256 (CTSRD-CHERI-llvm-project-11.0.d20201018-bec478d1d2a9aaeabe963c50d378411b7c1e089f_GH0.tar.gz) = d2ead47de06df58fbe14cadf49da2d6726f0b6287ccd293c465643ecdd82e2ca +SIZE (CTSRD-CHERI-llvm-project-11.0.d20201018-bec478d1d2a9aaeabe963c50d378411b7c1e089f_GH0.tar.gz) = 127606846 Modified: head/devel/llvm-cheri/pkg-descr ============================================================================== --- head/devel/llvm-cheri/pkg-descr Mon Oct 19 22:20:33 2020 (r552774) +++ head/devel/llvm-cheri/pkg-descr Mon Oct 19 23:06:01 2020 (r552775) @@ -1,8 +1,8 @@ The LLVM Project is a collection of modular and reusable compiler and -toolchain technologies. +toolchain technologies. This version adds support for CHERI on RISC-V +and MIPS64. This port includes Clang (a C/C++/Objective-C compiler), LLD (a linker), -LLDB (a debugger), an OpenMP runtime library, and the LLVM infrastructure -these are built on. +and the LLVM infrastructure these are built on. -WWW: http://llvm.org/ +WWW: http://cheri-cpu.org Modified: head/devel/llvm-cheri/pkg-plist ============================================================================== --- head/devel/llvm-cheri/pkg-plist Mon Oct 19 22:20:33 2020 (r552774) +++ head/devel/llvm-cheri/pkg-plist Mon Oct 19 23:06:01 2020 (r552775) @@ -2593,32 +2593,10 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Desc.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Disassembler.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Info.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64Utils.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUInfo.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAMDGPUUtils.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMARMAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMARMCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMARMDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMARMInfo.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMARMUtils.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMAVRInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmPrinter.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMBPFInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMBinaryFormat.a llvm%%LLVM_SUFFIX%%/lib/libLLVMBitReader.a llvm%%LLVM_SUFFIX%%/lib/libLLVMBitWriter.a @@ -2642,22 +2620,12 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenACC.a llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a llvm%%LLVM_SUFFIX%%/lib/libLLVMInstrumentation.a llvm%%LLVM_SUFFIX%%/lib/libLLVMInterpreter.a llvm%%LLVM_SUFFIX%%/lib/libLLVMJITLink.a llvm%%LLVM_SUFFIX%%/lib/libLLVMLTO.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMLanaiInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMLibDriver.a llvm%%LLVM_SUFFIX%%/lib/libLLVMLineEditor.a llvm%%LLVM_SUFFIX%%/lib/libLLVMLinker.a @@ -2667,19 +2635,11 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMMCDisassembler.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMIRParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430AsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430CodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Desc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Disassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMMSP430Info.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsAsmParser.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsCodeGen.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsDesc.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsDisassembler.a llvm%%LLVM_SUFFIX%%/lib/libLLVMMipsInfo.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMNVPTXInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a @@ -2687,11 +2647,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcError.a llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMProfileData.a llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVAsmParser.a llvm%%LLVM_SUFFIX%%/lib/libLLVMRISCVCodeGen.a @@ -2703,38 +2658,19 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMRemarks.a llvm%%LLVM_SUFFIX%%/lib/libLLVMRuntimeDyld.a llvm%%LLVM_SUFFIX%%/lib/libLLVMScalarOpts.a llvm%%LLVM_SUFFIX%%/lib/libLLVMSelectionDAG.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSparcInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMSupport.a llvm%%LLVM_SUFFIX%%/lib/libLLVMSymbolize.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMSystemZInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGen.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a llvm%%LLVM_SUFFIX%%/lib/libLLVMX86AsmParser.a llvm%%LLVM_SUFFIX%%/lib/libLLVMX86CodeGen.a llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Desc.a llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Disassembler.a llvm%%LLVM_SUFFIX%%/lib/libLLVMX86Info.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreCodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a llvm%%LLVM_SUFFIX%%/lib/libLTO.so