diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index f5745baab..cec3245d4 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -1,10 +1,11 @@ TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" -TERMUX_PKG_LICENSE="NCSA" +TERMUX_PKG_LICENSE="Apache-2.0, NCSA" +TERMUX_PKG_LICENSE_FILE="llvm/LICENSE.TXT" TERMUX_PKG_MAINTAINER="@buttaface" LLVM_MAJOR_VERSION=14 -TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.0.1 -TERMUX_PKG_SHA256=1a3c2e57916c5a70153aaf0a0e6f1230d6368b9e0f4d04dcb9e039a31b1cd4e6 +TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.0.3 +TERMUX_PKG_SHA256=44d3e7a784d5cf805e72853bb03f218bd1058d448c03ca883dabbebc99204e0c 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 TERMUX_PKG_RM_AFTER_INSTALL=" @@ -19,6 +20,7 @@ TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)" TERMUX_PKG_BREAKS="libclang, libclang-dev, libllvm-dev" TERMUX_PKG_REPLACES="gcc, libclang, libclang-dev, libllvm-dev" TERMUX_PKG_GROUPS="base-devel" +_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION) # See http://llvm.org/docs/CMake.html: TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DANDROID_PLATFORM_LEVEL=$TERMUX_PKG_API_LEVEL @@ -35,9 +37,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DDEFAULT_SYSROOT=$(dirname $TERMUX_PREFIX) -DLLVM_LINK_LLVM_DYLIB=ON -DLLDB_ENABLE_PYTHON=ON --DLLDB_PYTHON_RELATIVE_PATH=lib/python3.10/site-packages --DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python3.10 --DLLDB_PYTHON_EXT_SUFFIX=.cpython-310.so +-DLLDB_PYTHON_RELATIVE_PATH=lib/python${_PYTHON_VERSION}/site-packages +-DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${_PYTHON_VERSION} +-DLLDB_PYTHON_EXT_SUFFIX=.cpython-${_PYTHON_VERSION}.so -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen -DLLDB_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/lldb-tblgen -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen diff --git a/packages/libllvm/lldb.subpackage.sh b/packages/libllvm/lldb.subpackage.sh index a7e4e6dee..a5af6bb5c 100644 --- a/packages/libllvm/lldb.subpackage.sh +++ b/packages/libllvm/lldb.subpackage.sh @@ -2,6 +2,7 @@ TERMUX_SUBPKG_INCLUDE=" bin/lldb* include/lldb/ lib/liblldb.so +lib/python${_PYTHON_VERSION}/site-packages " TERMUX_SUBPKG_DESCRIPTION="LLVM-based debugger" TERMUX_SUBPKG_DEPENDS="libc++, libedit, libxml2, python, ncurses-ui-libs"