From nobody Mon Mar 21 22:21:15 2022 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 C063C1A24377; Mon, 21 Mar 2022 22:21:15 +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 4KMpx74pRtz3Mr0; Mon, 21 Mar 2022 22:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647901275; 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=1XJtPqUzxVHpHvUW6O/MKztbqNPFuDXcmTwk/ZwdGIQ=; b=Fr0Yt1N1I2EJ1fLn6bZFTFrQrqfzaBArZXR5lnhb/ycKTMGA6v7sM0lG/GGatdis91l6Hk RVCXS87LMM20WEnvBexsngTQLAoeySO8X0R1vJ8Lxtgl6KmpmQYELtqBLUa24vJpSNEZux +YvwznnP2o/tjIkrS5Mrcwt/uZfk2tz79sCNeBXvJSMEs/GvxBLYJTegID6vAL/iM3GjwX 0olvj4RIgWA1/+uykcgfGcPGlQQKsX/tba3z5Cy2nxqlQKzcKpoVyenWcwHo/fSad8AOsA /rYlTv5oX9lzqIe8zhz3hSeD3Pcwzm4NJ90+0imCuzufOyHf8Vxllcovg5xXNQ== 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 8550823994; Mon, 21 Mar 2022 22:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22LMLFpE040291; Mon, 21 Mar 2022 22:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22LMLF4r040290; Mon, 21 Mar 2022 22:21:15 GMT (envelope-from git) Date: Mon, 21 Mar 2022 22:21:15 GMT Message-Id: <202203212221.22LMLF4r040290@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: 809561e76a96 - main - devel/llvm14: Update to RC4 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: 809561e76a964879523be16e4b13e1226f450559 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647901275; 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=1XJtPqUzxVHpHvUW6O/MKztbqNPFuDXcmTwk/ZwdGIQ=; b=bJlE9DUGSSmJG1KzBPmap2RVoTllgm3b/GfdNugDP/1cMRvAMox2T9u6mLjbcgAuY9uxo+ LDRKnFc600OX2W2M4dUJia0q89/YE6L3HAuFVqMJsi7125JOAOyn92/c5Utyh7/P+GiRyx dMZRxYwvmIuxrnMHrp3GR+V7rq3wZLP/KTo2AtDPyHKAC9d/BKTpvO8RHOqXtfrGQ0QEO/ /aDzcYDYXA6ZPwz19llkHlp4UrZExyymJCyvkX0DDi1aPh4XYB+P0a47trE2lE5vT6IJjh aU2Ey29oYFl85TRR30959B21rO7I/nC6f70wB9LHWflaMWBaokSa5iY1To5fZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647901275; a=rsa-sha256; cv=none; b=QFJm/gJhw0f8BmGVceM3AukqK2ciFgCHV7NDcspPfLN1BTdfoO3WDiSirLw+qHzgnd6U88 6saQIrajtMkc/2vRDtuJ5pxxGzPpPb6IyAX2RCe6U15b8JDYdycMKCdxclT1NFhDACdO+k MpMNJ77fcNgJqRIXVTMKVkeHlh5Vgoc34vmRVj9fyhbIF/5s6MVkMRDB3pMMu1Xe8D8jFl NQFKtEiPWeRk77PF9GD4UhJJ1voxUZvKb50xAzfv7tLdE8DlrFIkWIhC+E97UCrtXbzRAo K5wfJSP78CAUyMZc/HBafI8DZAGir96PlFnHUY1a0vxE4c9TmjLLgo7iiDX96Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=809561e76a964879523be16e4b13e1226f450559 commit 809561e76a964879523be16e4b13e1226f450559 Author: Brooks Davis AuthorDate: 2022-03-21 22:21:01 +0000 Commit: Brooks Davis CommitDate: 2022-03-21 22:21:01 +0000 devel/llvm14: Update to RC4 Fix plist for BE_NATIVE. I'd forgotten to handle the new VE (vector engine) and a couple headers for armv7 and riscv how seem to be tied to their backends (this seems incomplete upstream as some related files are still installed unconditionally). Reported by: Mark Millard --- devel/llvm14/Makefile | 14 +++++++++----- devel/llvm14/distinfo | 6 +++--- devel/llvm14/pkg-plist | 12 ------------ 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index ff60cc8f2cf1..73d459cc20f6 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -1,5 +1,5 @@ PORTNAME= llvm -DISTVERSION= 14.0.0rc2 +DISTVERSION= 14.0.0rc4 PORTREVISION= 0 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ @@ -119,7 +119,8 @@ BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends BE_WASM_DESC= WebAssembly backend (required by firefox via wasi) .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} +BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} \ + ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/$} .endfor CLANG_DESC= Build clang CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp @@ -387,11 +388,12 @@ FREEBSD_BACKENDS+= WebAssembly NATIVE_BACKENDS+= WebAssembly .endif STANDARD_BACKENDS= ${_FREEBSD_BACKENDS} AMDGPU AVR BPF Hexagon Lanai \ - MSP430 NVPTX SystemZ WebAssembly XCore + MSP430 NVPTX SystemZ VE WebAssembly XCore _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser Disassembler Utils _BE_LIBS_BACKWARDS_AArch64=Exegesis _BE_LIBS_AMDGPU= AsmParser Disassembler TargetMCA Utils +_BE_INCS_ARM= arm_bf16.h arm_cde.h arm_fp16.h arm_mve.h arm_neon.h arm_sve.h _BE_LIBS_ARM= AsmParser Disassembler Utils _BE_LIBS_AVR= AsmParser Disassembler _BE_LIBS_BPF= AsmParser Disassembler @@ -402,6 +404,7 @@ _BE_LIBS_Mips= AsmParser Disassembler _BE_LIBS_BACKWARDS_Mips=Exegesis _BE_LIBS_PowerPC= AsmParser Disassembler _BE_LIBS_BACKWARDS_PowerPC=Exegesis +_BE_INCS_RISCV= riscv_vector.h _BE_LIBS_RISCV= AsmParser Disassembler _BE_LIBS_Sparc= AsmParser Disassembler _BE_LIBS_SystemZ= AsmParser Disassembler @@ -415,9 +418,10 @@ _BE_LIBS_XCore= Disassembler _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ ${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/} \ ${_BE_LIBS_BACKWARDS_${BE_ARCH}:S/$/${BE_ARCH}/} +_BE_INCS_${BE}+= ${_BE_INCS_${BE_ARCH}} .endfor .endfor -BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} +BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|}|${_BE_INCS_STANDARD:ts|} _CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd _CRTBLDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share @@ -653,7 +657,7 @@ build-plist: -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \ | ${SORT} >> ${PLIST}.tmp ${AWK} '{ \ - if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \ + if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN}|${BE_PATTERN})/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ diff --git a/devel/llvm14/distinfo b/devel/llvm14/distinfo index b48fee7c8c8d..8351353de4d3 100644 --- a/devel/llvm14/distinfo +++ b/devel/llvm14/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646430747 -SHA256 (llvm-project-14.0.0rc2.src.tar.xz) = e728c13e56034894994eefe596d1edd97a66c798a504fabd65f63ceb6befade1 -SIZE (llvm-project-14.0.0rc2.src.tar.xz) = 105579456 +TIMESTAMP = 1647237419 +SHA256 (llvm-project-14.0.0rc4.src.tar.xz) = ca833d5ca97b2d46053f6d2759fcd9ec3201201275e0c2119a4680356f5b0a15 +SIZE (llvm-project-14.0.0rc4.src.tar.xz) = 105583596 diff --git a/devel/llvm14/pkg-plist b/devel/llvm14/pkg-plist index 2c8ba929243e..3789c8d93673 100644 --- a/devel/llvm14/pkg-plist +++ b/devel/llvm14/pkg-plist @@ -4670,13 +4670,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/amxintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm64intr.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_acle.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_bf16.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_cde.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_cmse.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_fp16.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_mve.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_sve.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/armintr.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bf16intrin.h @@ -4783,7 +4777,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/profile/InstrProfData.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/riscv_vector.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h %%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/allocator_interface.h @@ -4969,11 +4962,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMTableGenGlobalISel.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMVEAsmParser.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMVECodeGen.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMVEDesc.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMVEDisassembler.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMVEInfo.a llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a