diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk index 21189e226a..28e88dd0a0 100644 --- a/packages/lang/llvm/package.mk +++ b/packages/lang/llvm/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="llvm" -PKG_VERSION="10.0.1" -PKG_SHA256="c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3" +PKG_VERSION="11.0.1" +PKG_SHA256="ccd87c254b6aebc5077e4e6977d08d4be888e7eb672c6630a26a15d58b59b528" PKG_ARCH="x86_64" PKG_LICENSE="Apache-2.0" PKG_SITE="http://llvm.org/" @@ -29,7 +29,7 @@ PKG_CMAKE_OPTS_COMMON="-DCMAKE_BUILD_TYPE=MinSizeRel \ -DLLVM_ENABLE_SPHINX=OFF \ -DLLVM_ENABLE_OCAMLDOC=OFF \ -DLLVM_ENABLE_BINDINGS=OFF \ - -DLLVM_TARGETS_TO_BUILD="AMDGPU" \ + -DLLVM_TARGETS_TO_BUILD=AMDGPU \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_ENABLE_WERROR=OFF \ diff --git a/packages/lang/llvm/patches/no-z3.patch b/packages/lang/llvm/patches/no-z3.patch deleted file mode 100644 index fc468ca3b7..0000000000 --- a/packages/lang/llvm/patches/no-z3.patch +++ /dev/null @@ -1,47 +0,0 @@ -Description: - Disable z3 to avoid pulling ocaml into main. - For some reason the cmake option LLVM_ENABLE_Z3_SOLVER was not taken into account -Author: Gianfranco Costamagna - -Last-Update: 2019-11-26 - -Index: llvm-toolchain-9-9.0.0/CMakeLists.txt -=================================================================== ---- llvm-toolchain-9-9.0.0.orig/CMakeLists.txt -+++ llvm-toolchain-9-9.0.0/CMakeLists.txt -@@ -340,24 +340,22 @@ - - set(LLVM_Z3_INSTALL_DIR "" CACHE STRING "Install directory of the Z3 solver.") - --find_package(Z3 4.7.1) -- --if (LLVM_Z3_INSTALL_DIR) -- if (NOT Z3_FOUND) -- message(FATAL_ERROR "Z3 >= 4.7.1 has not been found in LLVM_Z3_INSTALL_DIR: ${LLVM_Z3_INSTALL_DIR}.") -- endif() --endif() -- --set(LLVM_ENABLE_Z3_SOLVER_DEFAULT "${Z3_FOUND}") -- - option(LLVM_ENABLE_Z3_SOLVER - "Enable Support for the Z3 constraint solver in LLVM." -- ${LLVM_ENABLE_Z3_SOLVER_DEFAULT} -+ OFF - ) - - if (LLVM_ENABLE_Z3_SOLVER) -- if (NOT Z3_FOUND) -- message(FATAL_ERROR "LLVM_ENABLE_Z3_SOLVER cannot be enabled when Z3 is not available.") -+ find_package(Z3 4.7.1) -+ -+ if (LLVM_Z3_INSTALL_DIR) -+ if (NOT Z3_FOUND) -+ message(FATAL_ERROR "Z3 >= 4.7.1 has not been found in LLVM_Z3_INSTALL_DIR: ${LLVM_Z3_INSTALL_DIR}.") -+ endif() -+ else() -+ if (NOT Z3_FOUND) -+ message(FATAL_ERROR "LLVM_ENABLE_Z3_SOLVER cannot be enabled when Z3 is not available.") -+ endif() - endif() - - set(LLVM_WITH_Z3 1)