From d7d422a456a7dab67426ae272616afb87d4407f8 Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Sun, 3 Mar 2024 08:39:22 +0530 Subject: [PATCH] bump(libllvm): 17.0.6 to 18.1.2 --- packages/libllvm/build.sh | 7 +++--- ...lang-include-clang-Driver-Options.td.patch | 4 +-- packages/libllvm/clang.subpackage.sh | 1 + packages/libllvm/libcompiler-rt.subpackage.sh | 2 ++ packages/libllvm/llvm-config.in | 25 ++++++++++--------- packages/libllvm/llvm-tools.subpackage.sh | 3 ++- packages/libllvm/mlir.subpackage.sh | 1 + scripts/setup-ubuntu.sh | 1 + 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index d35295c494..6c8da6caa0 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" TERMUX_PKG_LICENSE="Apache-2.0, NCSA" TERMUX_PKG_LICENSE_FILE="llvm/LICENSE.TXT" TERMUX_PKG_MAINTAINER="@finagolfin" -LLVM_MAJOR_VERSION=17 -TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.0.6 -TERMUX_PKG_SHA256=58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813 +LLVM_MAJOR_VERSION=18 +TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.2 +TERMUX_PKG_SHA256=51073febd91d1f2c3b411d022695744bda322647e76e0b4eb1918229210c48d5 TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-project-${TERMUX_PKG_VERSION}.src.tar.xz TERMUX_PKG_HOSTBUILD=true @@ -120,6 +120,7 @@ termux_step_post_make_install() { done ln -f -s clang++ clang++-${LLVM_MAJOR_VERSION} + ln -f -s ${LLVM_MAJOR_VERSION} $TERMUX_PREFIX/lib/clang/latest if [ $TERMUX_ARCH == "arm" ]; then # For arm we replace symlinks with the same type of diff --git a/packages/libllvm/clang-include-clang-Driver-Options.td.patch b/packages/libllvm/clang-include-clang-Driver-Options.td.patch index 4b98436439..cbde44938c 100644 --- a/packages/libllvm/clang-include-clang-Driver-Options.td.patch +++ b/packages/libllvm/clang-include-clang-Driver-Options.td.patch @@ -8,8 +8,8 @@ index 59e1337599b2..656545555349 100644 BooleanFFlag<"strength-reduce">, Group; +defm termux_rpath : BoolFOption<"termux-rpath", + LangOpts<"OpenMP">, DefaultTrue, -+ NegFlag, PosFlag, -+ BothFlags<[], " setting rpaths for the Termux environment">>; ++ NegFlag, PosFlag, ++ BothFlags<[], [ClangOption, CC1Option], " setting rpaths for the Termux environment">>; defm tls_model : BooleanFFlag<"tls-model">, Group; defm tracer : BooleanFFlag<"tracer">, Group; defm tree_dce : BooleanFFlag<"tree-dce">, Group; diff --git a/packages/libllvm/clang.subpackage.sh b/packages/libllvm/clang.subpackage.sh index adfd6ee9c0..584ac54fda 100644 --- a/packages/libllvm/clang.subpackage.sh +++ b/packages/libllvm/clang.subpackage.sh @@ -26,6 +26,7 @@ lib/clang/*/include/llvm_libc_wrappers/ lib/clang/*/include/openmp_wrappers/ lib/clang/*/include/orc/ lib/clang/*/include/ppc_wrappers/ +lib/clang/*/include/profile/ lib/cmake/clang lib/cmake/openmp lib/libarcher.so diff --git a/packages/libllvm/libcompiler-rt.subpackage.sh b/packages/libllvm/libcompiler-rt.subpackage.sh index df5bd34c18..eb7eb538ad 100644 --- a/packages/libllvm/libcompiler-rt.subpackage.sh +++ b/packages/libllvm/libcompiler-rt.subpackage.sh @@ -11,6 +11,8 @@ lib/clang/*/share/asan_ignorelist.txt lib/clang/*/share/cfi_ignorelist.txt lib/clang/*/share/hwasan_ignorelist.txt " +TERMUX_SUBPKG_DEPEND_ON_PARENT=no +TERMUX_SUBPKG_DEPENDS=libc++ TERMUX_SUBPKG_CONFLICTS="ndk-multilib (<< 23b-6)" termux_step_create_subpkg_debscripts() { diff --git a/packages/libllvm/llvm-config.in b/packages/libllvm/llvm-config.in index 508efee03d..7b073e82cb 100644 --- a/packages/libllvm/llvm-config.in +++ b/packages/libllvm/llvm-config.in @@ -57,10 +57,10 @@ avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreade bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen \ codegentypes core coroutines coverage csky cskyasmparser cskycodegen cskydesc cskydisassembler \ cskyinfo debuginfobtf debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview \ -debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerparallel \ -dwp engine executionengine extensions filecheck frontendhlsl frontendopenacc \ -frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen \ -hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub \ +debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerclassic dwarflinkerparallel \ +dwp engine executionengine extensions filecheck frontenddriver frontendhlsl frontendoffloading \ +frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen \ +hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub \ interpreter ipo irprinter irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc \ lanaidisassembler lanaiinfo libdriver lineeditor linker loongarch loongarchasmparser \ loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser \ @@ -68,12 +68,12 @@ m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcpar mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 \ msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native \ nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object \ -objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser \ +objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser \ powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks \ riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca \ runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc \ sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen \ -systemzdesc systemzdisassembler systemzinfo tablegen target targetparser textapi \ +systemzdesc systemzdisassembler systemzinfo tablegen target targetparser textapi textapibinaryreader \ transformutils ve veasmparser vecodegen vectorize vedesc vedisassembler veinfo \ webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler \ webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser \ @@ -98,24 +98,25 @@ static_libs="-lLLVMWindowsManifest -lLLVMXRay -lLLVMLibDriver -lLLVMDlltoolDrive -lLLVMMipsDesc -lLLVMMipsInfo -lLLVMLoongArchDisassembler -lLLVMLoongArchAsmParser \ -lLLVMLoongArchCodeGen -lLLVMLoongArchDesc -lLLVMLoongArchInfo -lLLVMLanaiDisassembler \ -lLLVMLanaiCodeGen -lLLVMLanaiAsmParser -lLLVMLanaiDesc -lLLVMLanaiInfo -lLLVMHexagonDisassembler \ --lLLVMHexagonCodeGen -lLLVMHexagonAsmParser -lLLVMHexagonDesc -lLLVMHexagonInfo \ +-lLLVMHexagonCodeGen -lLLVMHexagonAsmParser -lLLVMHexagonDesc -lLLVMHexagonInfo -lLLVMHipStdPar \ -lLLVMBPFDisassembler -lLLVMBPFAsmParser -lLLVMBPFCodeGen -lLLVMBPFDesc -lLLVMBPFInfo \ -lLLVMAVRDisassembler -lLLVMAVRAsmParser -lLLVMAVRCodeGen -lLLVMAVRDesc -lLLVMAVRInfo \ -lLLVMARMDisassembler -lLLVMARMAsmParser -lLLVMARMCodeGen -lLLVMARMDesc -lLLVMARMUtils \ -lLLVMARMInfo -lLLVMAMDGPUTargetMCA -lLLVMAMDGPUDisassembler -lLLVMAMDGPUAsmParser \ -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUUtils -lLLVMAMDGPUInfo -lLLVMAArch64Disassembler \ -lLLVMAArch64AsmParser -lLLVMAArch64CodeGen -lLLVMAArch64Desc -lLLVMAArch64Utils \ --lLLVMAArch64Info -lLLVMOrcJIT -lLLVMWindowsDriver -lLLVMMCJIT -lLLVMJITLink -lLLVMInterpreter \ +-lLLVMAArch64Info -lLLVMOrcDebugging -lLLVMOrcJIT -lLLVMWindowsDriver -lLLVMMCJIT -lLLVMJITLink -lLLVMInterpreter \ -lLLVMExecutionEngine -lLLVMRuntimeDyld -lLLVMOrcTargetProcess -lLLVMOrcShared -lLLVMDWP \ -lLLVMDebugInfoLogicalView -lLLVMDebugInfoGSYM -lLLVMOption -lLLVMObjectYAML -lLLVMObjCopy \ --lLLVMMCA -lLLVMMCDisassembler -lLLVMLTO -lLLVMCFGuard -lLLVMFrontendOpenACC -lLLVMFrontendHLSL \ --lLLVMExtensions -lPolly -lPollyISL -lLLVMPasses -lLLVMCoroutines -lLLVMipo -lLLVMInstrumentation \ --lLLVMVectorize -lLLVMLinker -lLLVMFrontendOpenMP -lLLVMDWARFLinkerParallel -lLLVMDWARFLinker \ +-lLLVMMCA -lLLVMMCDisassembler -lLLVMLTO -lLLVMCFGuard -lLLVMFrontendDriver -lLLVMFrontendOffloading \ +-lLLVMFrontendOpenACC -lLLVMFrontendHLSL -lLLVMExtensions -lPolly -lPollyISL -lLLVMPasses \ +-lLLVMCoroutines -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize -lLLVMLinker \ +-lLLVMFrontendOpenMP -lLLVMDWARFLinkerClassic -lLLVMDWARFLinkerParallel -lLLVMDWARFLinker \ -lLLVMGlobalISel -lLLVMMIRParser -lLLVMAsmPrinter -lLLVMSelectionDAG -lLLVMCodeGen -lLLVMCodeGenTypes \ -lLLVMObjCARCOpts -lLLVMIRPrinter -lLLVMInterfaceStub -lLLVMFileCheck -lLLVMFuzzMutate \ -lLLVMTarget -lLLVMScalarOpts -lLLVMInstCombine -lLLVMAggressiveInstCombine -lLLVMTransformUtils \ -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMSymbolize -lLLVMDebugInfoBTF -lLLVMDebugInfoPDB \ --lLLVMDebugInfoMSF -lLLVMDebugInfoDWARF -lLLVMObject -lLLVMTextAPI -lLLVMMCParser \ +-lLLVMDebugInfoMSF -lLLVMDebugInfoDWARF -lLLVMObject -lLLVMTextAPI -lLLVMTextAPIBinaryReader -lLLVMMCParser \ -lLLVMIRReader -lLLVMAsmParser -lLLVMMC -lLLVMDebugInfoCodeView -lLLVMBitReader \ -lLLVMFuzzerCLI -lLLVMCore -lLLVMRemarks -lLLVMBitstreamReader -lLLVMBinaryFormat \ -lLLVMTargetParser -lLLVMTableGen -lLLVMSupport -lLLVMDemangle" diff --git a/packages/libllvm/llvm-tools.subpackage.sh b/packages/libllvm/llvm-tools.subpackage.sh index f03a903f38..efc9d7f02f 100644 --- a/packages/libllvm/llvm-tools.subpackage.sh +++ b/packages/libllvm/llvm-tools.subpackage.sh @@ -12,6 +12,7 @@ bin/yaml2obj share/man/man1/FileCheck.1.gz " TERMUX_SUBPKG_DESCRIPTION="LLVM Development Tools" -TERMUX_SUBPKG_DEPENDS="libc++, ncurses, zlib" +TERMUX_SUBPKG_DEPEND_ON_PARENT=no +TERMUX_SUBPKG_DEPENDS="libc++, ncurses, zlib, zstd" TERMUX_SUBPKG_BREAKS="libllvm (<< 16.0.0)" TERMUX_SUBPKG_REPLACES="libllvm (<< 16.0.0)" diff --git a/packages/libllvm/mlir.subpackage.sh b/packages/libllvm/mlir.subpackage.sh index 76eebf4190..be5a0f74ae 100644 --- a/packages/libllvm/mlir.subpackage.sh +++ b/packages/libllvm/mlir.subpackage.sh @@ -1,6 +1,7 @@ TERMUX_SUBPKG_INCLUDE=" bin/mlir-* bin/tblgen-lsp-server +bin/tblgen-to-irdl include/mlir* lib/cmake/mlir/ lib/libMLIR.so diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 9e9d307604..4eaf0a40af 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -54,6 +54,7 @@ PACKAGES+=" help2man" PACKAGES+=" pandoc" PACKAGES+=" python3-docutils" PACKAGES+=" python3-recommonmark" +PACKAGES+=" python3-myst-parser" PACKAGES+=" python3-sphinx" PACKAGES+=" python3-sphinx-rtd-theme" PACKAGES+=" python3-sphinxcontrib.qthelp"