From 827b038c76dd3a64cc9f41214a0b7c4985726339 Mon Sep 17 00:00:00 2001 From: augiedoggie Date: Fri, 21 Jan 2022 01:09:51 -0700 Subject: [PATCH] llvm12: update to 12.0.1 and add missing provides (#6540) * use ninja for TEST() --- ...m12-12.0.0.recipe => llvm12-12.0.1.recipe} | 68 +++++++++++++++---- ...-12.0.0.patchset => clang-12.0.1.patchset} | 0 ...ld-12.0.0.patchset => lld-12.0.1.patchset} | 0 ...m-12.0.0.patchset => llvm-12.0.1.patchset} | 0 4 files changed, 56 insertions(+), 12 deletions(-) rename sys-devel/llvm/{llvm12-12.0.0.recipe => llvm12-12.0.1.recipe} (89%) rename sys-devel/llvm/patches/{clang-12.0.0.patchset => clang-12.0.1.patchset} (100%) rename sys-devel/llvm/patches/{lld-12.0.0.patchset => lld-12.0.1.patchset} (100%) rename sys-devel/llvm/patches/{llvm-12.0.0.patchset => llvm-12.0.1.patchset} (100%) diff --git a/sys-devel/llvm/llvm12-12.0.0.recipe b/sys-devel/llvm/llvm12-12.0.1.recipe similarity index 89% rename from sys-devel/llvm/llvm12-12.0.0.recipe rename to sys-devel/llvm/llvm12-12.0.1.recipe index 89e0233a3..864f26914 100644 --- a/sys-devel/llvm/llvm12-12.0.0.recipe +++ b/sys-devel/llvm/llvm12-12.0.1.recipe @@ -31,21 +31,21 @@ other than the ones listed above. HOMEPAGE="https://www.llvm.org/" COPYRIGHT="2003-2019 University of Illinois at Urbana-Champaign" LICENSE="Apache v2 with LLVM Exception" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-$portVersion.src.tar.xz" -CHECKSUM_SHA256="49dc47c8697a1a0abd4ee51629a696d7bfe803662f2a7252a3b16fc75f3a8b50" +CHECKSUM_SHA256="7d9a8405f557cefc5a21bf5672af73903b64749d9bc3a50322239f56f34ffddf" SOURCE_DIR="llvm-$portVersion.src" SOURCE_URI_2="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/clang-$portVersion.src.tar.xz" -CHECKSUM_SHA256_2="e26e452e91d4542da3ebbf404f024d3e1cbf103f4cd110c26bf0a19621cca9ed" +CHECKSUM_SHA256_2="6e912133bcf56e9cfe6a346fa7e5c52c2cde3e4e48b7a6cc6fcc7c75047da45f" SOURCE_DIR_2="clang-$portVersion.src" SOURCE_URI_3="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/clang-tools-extra-$portVersion.src.tar.xz" -CHECKSUM_SHA256_3="ad41e0b527a65ade95c1ba690a5434cefaab4a2daa1be307caaa1e8541fe6d5c" +CHECKSUM_SHA256_3="65659efdf97dbed70ae0caee989936b731f249dddc46f1cb4225b2f49b232ae5" SOURCE_DIR_3="clang-tools-extra-$portVersion.src" SOURCE_URI_4="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/compiler-rt-$portVersion.src.tar.xz" -CHECKSUM_SHA256_4="85a8cd0a62413eaa0457d8d02f8edac38c4dc0c96c00b09dc550260c23268434" +CHECKSUM_SHA256_4="b4c8d5f2a802332987c1c0a95b5afb35b1a66a96fe44add4e4ed4792c4cba0a4" SOURCE_DIR_4="compiler-rt-$portVersion.src" SOURCE_URI_5="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/lld-$portVersion.src.tar.xz" -CHECKSUM_SHA256_5="2cb7d497f3ce33ce8a2c50ad26ec93a8c45f57268d4d96953cd0f25566f753fd" +CHECKSUM_SHA256_5="690b3f6a76310e13a783a142f87500ade9cafe003e088b678364487ed873e361" SOURCE_DIR_5="lld-$portVersion.src" PATCHES="llvm-$portVersion.patchset" PATCHES_2="clang-$portVersion.patchset" @@ -66,6 +66,7 @@ PROVIDES=" cmd:llvm_addr2line cmd:llvm_ar cmd:llvm_as + cmd:llvm_bitcode_strip cmd:llvm_bcanalyzer cmd:llvm_c_test cmd:llvm_cat @@ -84,14 +85,19 @@ PROVIDES=" cmd:llvm_elfabi cmd:llvm_exegesis cmd:llvm_extract + cmd:llvm_gsymutil + cmd:llvm_ifs + cmd:llvm_install_name_tool cmd:llvm_jitlink cmd:llvm_lib + cmd:llvm_libtool_darwin cmd:llvm_link cmd:llvm_lipo cmd:llvm_lto cmd:llvm_lto2 cmd:llvm_mc cmd:llvm_mca + cmd:llvm_ml cmd:llvm_modextract cmd:llvm_mt cmd:llvm_nm @@ -100,10 +106,12 @@ PROVIDES=" cmd:llvm_opt_report cmd:llvm_pdbutil cmd:llvm_profdata + cmd:llvm_profgen cmd:llvm_ranlib cmd:llvm_rc cmd:llvm_readelf cmd:llvm_readobj + cmd:llvm_reduce cmd:llvm_rtdyld cmd:llvm_size cmd:llvm_split @@ -116,8 +124,10 @@ PROVIDES=" cmd:llvm_xray cmd:obj2yaml cmd:opt + cmd:pp_trace cmd:sancov cmd:sanstats + cmd:split_file cmd:verify_uselistorder cmd:yaml2obj devel:libfindAllSymbols$secondaryArchSuffix @@ -146,6 +156,11 @@ PROVIDES=" devel:libLLVMAnalysis$secondaryArchSuffix devel:libLLVMAsmParser$secondaryArchSuffix devel:libLLVMAsmPrinter$secondaryArchSuffix + devel:libLLVMAVRAsmParser$secondaryArchSuffix + devel:libLLVMAVRCodeGen$secondaryArchSuffix + devel:libLLVMAVRDesc$secondaryArchSuffix + devel:libLLVMAVRDisassembler$secondaryArchSuffix + devel:libLLVMAVRInfo$secondaryArchSuffix devel:libLLVMBPFAsmParser$secondaryArchSuffix devel:libLLVMBPFCodeGen$secondaryArchSuffix devel:libLLVMBPFDesc$secondaryArchSuffix @@ -155,6 +170,7 @@ PROVIDES=" devel:libLLVMBitReader$secondaryArchSuffix devel:libLLVMBitWriter$secondaryArchSuffix devel:libLLVMBitstreamReader$secondaryArchSuffix + devel:libLLVMCFGuard$secondaryArchSuffix devel:libLLVMCodeGen$secondaryArchSuffix devel:libLLVMCore$secondaryArchSuffix devel:libLLVMCoroutines$secondaryArchSuffix @@ -166,9 +182,15 @@ PROVIDES=" devel:libLLVMDebugInfoPDB$secondaryArchSuffix devel:libLLVMDemangle$secondaryArchSuffix devel:libLLVMDlltoolDriver$secondaryArchSuffix + devel:libLLVMDWARFLinker$secondaryArchSuffix devel:libLLVMExecutionEngine$secondaryArchSuffix + devel:libLLVMExtensions$secondaryArchSuffix + devel:libLLVMFileCheck$secondaryArchSuffix + devel:libLLVMFrontendOpenAcc$secondaryArchSuffix + devel:libLLVMFrontendOpenMP$secondaryArchSuffix devel:libLLVMFuzzMutate$secondaryArchSuffix devel:libLLVMGlobalISel$secondaryArchSuffix + devel:libLLVMHelloNew$secondaryArchSuffix devel:libLLVMHexagonAsmParser$secondaryArchSuffix devel:libLLVMHexagonCodeGen$secondaryArchSuffix devel:libLLVMHexagonDesc$secondaryArchSuffix @@ -177,6 +199,7 @@ PROVIDES=" devel:libLLVMIRReader$secondaryArchSuffix devel:libLLVMInstCombine$secondaryArchSuffix devel:libLLVMInstrumentation$secondaryArchSuffix + devel:libLLVMInterfaceStub$secondaryArchSuffix devel:libLLVMInterpreter$secondaryArchSuffix devel:libLLVMJITLink$secondaryArchSuffix devel:libLLVMLTO$secondaryArchSuffix @@ -212,6 +235,8 @@ PROVIDES=" devel:libLLVMObjectYAML$secondaryArchSuffix devel:libLLVMOption$secondaryArchSuffix devel:libLLVMOrcJIT$secondaryArchSuffix + devel:libLLVMOrcShared$secondaryArchSuffix + devel:libLLVMOrcTargetProcess$secondaryArchSuffix devel:libLLVMPasses$secondaryArchSuffix devel:libLLVMPowerPCAsmParser$secondaryArchSuffix devel:libLLVMPowerPCCodeGen$secondaryArchSuffix @@ -304,7 +329,9 @@ PROVIDES_clang=" cmd:clang_func_mapping = $portVersion cmd:clang_import_test = $portVersion cmd:clang_include_fixer = $portVersion + cmd:clang_move = $portVersion cmd:clang_offload_bundler = $portVersion + cmd:clang_offload_wrapper = $portVersion cmd:clang_query = $portVersion cmd:clang_refactor = $portVersion cmd:clang_rename = $portVersion @@ -317,6 +344,7 @@ PROVIDES_clang=" devel:libclang$secondaryArchSuffix = $portVersion compat >= 12 devel:libclang_cpp$secondaryArchSuffix = $portVersion compat >= 12 devel:libclanganalysis$secondaryArchSuffix = $portVersion + devel:libclangapinotes$secondaryArchSuffix = $portVersion devel:libclangapplyreplacements$secondaryArchSuffix = $portVersion devel:libclangarcmigrate$secondaryArchSuffix = $portVersion devel:libclangast$secondaryArchSuffix = $portVersion @@ -330,7 +358,9 @@ PROVIDES_clang=" devel:libclangdependencyscanning$secondaryArchSuffix = $portVersion devel:libclangdoc$secondaryArchSuffix = $portVersion devel:libclangdirectorywatcher$secondaryArchSuffix = $portVersion + devel:libclangdremoteindex$secondaryArchSuffix = $portVersion devel:libclangdriver$secondaryArchSuffix = $portVersion + devel:libclangdsupport$secondaryArchSuffix = $portVersion devel:libclangdynamicastmatchers$secondaryArchSuffix = $portVersion devel:libclangedit$secondaryArchSuffix = $portVersion devel:libclangformat$secondaryArchSuffix = $portVersion @@ -341,6 +371,7 @@ PROVIDES_clang=" devel:libclangincludefixer$secondaryArchSuffix = $portVersion devel:libclangincludefixerplugin$secondaryArchSuffix = $portVersion devel:libclangindex$secondaryArchSuffix = $portVersion + devel:libclangindexserialization$secondaryArchSuffix = $portVersion devel:libclanglex$secondaryArchSuffix = $portVersion devel:libclangmove$secondaryArchSuffix = $portVersion devel:libclangparse$secondaryArchSuffix = $portVersion @@ -353,17 +384,24 @@ PROVIDES_clang=" devel:libclangstaticanalyzercheckers$secondaryArchSuffix = $portVersion devel:libclangstaticanalyzercore$secondaryArchSuffix = $portVersion devel:libclangstaticanalyzerfrontend$secondaryArchSuffix = $portVersion + devel:libclangtesting$secondaryArchSuffix = $portVersion devel:libclangtidy$secondaryArchSuffix = $portVersion devel:libclangtidyabseilmodule$secondaryArchSuffix = $portVersion + devel:libclangtidyalteramodule$secondaryArchSuffix = $portVersion devel:libclangtidyandroidmodule$secondaryArchSuffix = $portVersion devel:libclangtidyboostmodule$secondaryArchSuffix = $portVersion devel:libclangtidybugpronemodule$secondaryArchSuffix = $portVersion devel:libclangtidycertmodule$secondaryArchSuffix = $portVersion + devel:libclangtidyconcurrencymodule$secondaryArchSuffix = $portVersion devel:libclangtidycppcoreguidelinesmodule$secondaryArchSuffix = $portVersion + devel:libclangtidydarwinmodule$secondaryArchSuffix = $portVersion devel:libclangtidyfuchsiamodule$secondaryArchSuffix = $portVersion devel:libclangtidygooglemodule$secondaryArchSuffix = $portVersion devel:libclangtidyhicppmodule$secondaryArchSuffix = $portVersion + devel:libclangtidylinuxkernelmodule$secondaryArchSuffix = $portVersion + devel:libclangtidyllvmlibcmodule$secondaryArchSuffix = $portVersion devel:libclangtidyllvmmodule$secondaryArchSuffix = $portVersion + devel:libclangtidymain$secondaryArchSuffix = $portVersion devel:libclangtidymiscmodule$secondaryArchSuffix = $portVersion devel:libclangtidymodernizemodule$secondaryArchSuffix = $portVersion devel:libclangtidympimodule$secondaryArchSuffix = $portVersion @@ -382,6 +420,7 @@ PROVIDES_clang=" devel:libclangtoolingrefactor$secondaryArchSuffix = $portVersion devel:libclangtoolingrefactoring$secondaryArchSuffix = $portVersion devel:libclangtoolingsyntax$secondaryArchSuffix = $portVersion + devel:libclangtransformer$secondaryArchSuffix = $portVersion " REQUIRES_clang=" haiku$secondaryArchSuffix @@ -421,6 +460,7 @@ PROVIDES_lld=" llvm12${secondaryArchSuffix}_lld = $portVersion cmd:ld.lld = $portVersion cmd:ld64.lld = $portVersion + cmd:ld64.lld.darwinnew = $portVersion cmd:lld = $portVersion cmd:lld_link = $portVersion cmd:wasm_ld = $portVersion @@ -444,9 +484,9 @@ PROVIDES_libs=" llvm12${secondaryArchSuffix}_libs = $portVersion lib:libclang$secondaryArchSuffix = $portVersion compat >= 12 lib:libclang_cpp$secondaryArchSuffix = $portVersion compat >= 12 - lib:libLLVM_12$secondaryArchSuffix = 12.0.0 compat >= 12.0 - lib:libLTO$secondaryArchSuffix = 12.0.0 compat >= 12 - lib:libRemarks$secondaryArchSuffix = 12.0.0 compat >= 12 + lib:libLLVM_12$secondaryArchSuffix = 12.0.1 compat >= 12.0 + lib:libLTO$secondaryArchSuffix = 12.0.1 compat >= 12 + lib:libRemarks$secondaryArchSuffix = 12.0.1 compat >= 12 " REQUIRES_libs=" haiku$secondaryArchSuffix @@ -594,6 +634,7 @@ INSTALL() packageEntries lld \ $binDir/ld.lld \ $binDir/ld64.lld \ + $binDir/ld64.lld.darwinnew \ $binDir/lld \ $binDir/lld-link \ $binDir/wasm-ld \ @@ -615,8 +656,11 @@ INSTALL() TEST() { - cd build - export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/lib export LIT_ARGS="-v" - make check-llvm + if [ "$targetArchitecture" = x86_gcc2 ];then + export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/lib/x86 + else + export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/lib + fi + ninja -C build check-llvm } diff --git a/sys-devel/llvm/patches/clang-12.0.0.patchset b/sys-devel/llvm/patches/clang-12.0.1.patchset similarity index 100% rename from sys-devel/llvm/patches/clang-12.0.0.patchset rename to sys-devel/llvm/patches/clang-12.0.1.patchset diff --git a/sys-devel/llvm/patches/lld-12.0.0.patchset b/sys-devel/llvm/patches/lld-12.0.1.patchset similarity index 100% rename from sys-devel/llvm/patches/lld-12.0.0.patchset rename to sys-devel/llvm/patches/lld-12.0.1.patchset diff --git a/sys-devel/llvm/patches/llvm-12.0.0.patchset b/sys-devel/llvm/patches/llvm-12.0.1.patchset similarity index 100% rename from sys-devel/llvm/patches/llvm-12.0.0.patchset rename to sys-devel/llvm/patches/llvm-12.0.1.patchset