diff --git a/packages/python-llvmlite/build.sh b/packages/python-llvmlite/build.sh index ecc43d7046..991af49f3e 100644 --- a/packages/python-llvmlite/build.sh +++ b/packages/python-llvmlite/build.sh @@ -5,17 +5,16 @@ TERMUX_PKG_LICENSE="BSD 2-Clause, Apache-2.0" TERMUX_PKG_LICENSE_FILE="LICENSE, LICENSE.thirdparty" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=( - "0.44.0" - "15.0.7" + "0.46.0" + "20.1.8" ) -TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=( "https://github.com/numba/llvmlite/archive/refs/tags/v${TERMUX_PKG_VERSION[0]}.tar.gz" "https://github.com/llvm/llvm-project/releases/download/llvmorg-${TERMUX_PKG_VERSION[1]}/llvm-project-${TERMUX_PKG_VERSION[1]}.src.tar.xz" ) TERMUX_PKG_SHA256=( - 71ec10b77a813e9ceec5f0bdf072a89c838135e6ba182cc1d3a391a59aef37b8 - 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 + 34733887fd325a7392eef69b15879d37b02694e1e6b01ba11ed67c3b251290c5 + 6898f963c8e938981e6c4a302e83ec5beb4630147c7311183cf61069af16333d ) TERMUX_PKG_DEPENDS="libc++, libffi, python, python-pip" TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" @@ -31,7 +30,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DLLVM_ENABLE_PIC=ON -DLLVM_INCLUDE_TESTS=OFF -DDEFAULT_SYSROOT=$(dirname $TERMUX_PREFIX) --DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen +-DLLVM_NATIVE_TOOL_DIR=$TERMUX_PKG_HOSTBUILD_DIR/bin +-DCROSS_TOOLCHAIN_FLAGS_LLVM_NATIVE=-DLLVM_NATIVE_TOOL_DIR=$TERMUX_PKG_HOSTBUILD_DIR/bin -DLIBOMP_ENABLE_SHARED=FALSE -DLLVM_ENABLE_SPHINX=ON -DSPHINX_OUTPUT_MAN=ON diff --git a/packages/python-llvmlite/ffi-build.py.patch b/packages/python-llvmlite/ffi-build.py.patch index 75a68e9299..943e61dd55 100644 --- a/packages/python-llvmlite/ffi-build.py.patch +++ b/packages/python-llvmlite/ffi-build.py.patch @@ -1,11 +1,11 @@ --- a/ffi/build.py +++ b/ffi/build.py -@@ -239,6 +239,8 @@ +@@ -194,6 +194,8 @@ def main_posix(library_ext): def main(): + if os.environ.get("LLVMLITE_SKIP_BUILD_LIBRARY", "0") == "1": + return + ELF_systems = ('linux', 'gnu', 'freebsd', 'openbsd', 'netbsd') if sys.platform == 'win32': main_windows() - elif sys.platform.startswith(('linux', 'gnu')): diff --git a/packages/python-llvmlite/llvm-tools-llvm-shlib-CMakeLists.txt.patch b/packages/python-llvmlite/llvm-tools-llvm-shlib-CMakeLists.txt.patch deleted file mode 100644 index f4445c94ea..0000000000 --- a/packages/python-llvmlite/llvm-tools-llvm-shlib-CMakeLists.txt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/llvm-project/llvm/tools/llvm-shlib/CMakeLists.txt 2019-03-20 21:24:00.144316380 +0000 -+++ b/llvm-project/llvm/tools/llvm-shlib/CMakeLists.txt 2019-03-20 21:25:26.117941452 +0000 -@@ -48,6 +48,7 @@ - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD") - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia") - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly") -+ OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Android") - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf" - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in