Merge pull request #5840 from termux/libllvm
libllvm: add libpolly and libcompiler-rt subpackages
This commit is contained in:
Henrik Grimler
GitHub
commit
935035ca87
@ -2,17 +2,21 @@ TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/
|
||||
TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library"
|
||||
TERMUX_PKG_LICENSE="NCSA"
|
||||
TERMUX_PKG_VERSION=10.0.1
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_SHA256=(c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3
|
||||
f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24
|
||||
591449e0aa623a6318d5ce2371860401653c48bb540982ccdd933992cb88df7a
|
||||
d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44
|
||||
d093782bcfcd0c3f496b67a5c2c997ab4b85816b62a7dd5b27026634ccf5c11a)
|
||||
d093782bcfcd0c3f496b67a5c2c997ab4b85816b62a7dd5b27026634ccf5c11a
|
||||
d90dc8e121ca0271f0fd3d639d135bfaa4b6ed41e67bd6eb77808f72629658fa
|
||||
d2fb0bb86b21db1f52402ba231da7c119c35c21dfb843c9496fe901f2d6aa25a)
|
||||
TERMUX_PKG_SRCURL=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-$TERMUX_PKG_VERSION.src.tar.xz
|
||||
https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/clang-$TERMUX_PKG_VERSION.src.tar.xz
|
||||
https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/lld-$TERMUX_PKG_VERSION.src.tar.xz
|
||||
https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/openmp-$TERMUX_PKG_VERSION.src.tar.xz
|
||||
https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/clang-tools-extra-$TERMUX_PKG_VERSION.src.tar.xz)
|
||||
https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/clang-tools-extra-$TERMUX_PKG_VERSION.src.tar.xz
|
||||
https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/compiler-rt-$TERMUX_PKG_VERSION.src.tar.xz
|
||||
https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/polly-$TERMUX_PKG_VERSION.src.tar.xz)
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="
|
||||
lib/libgomp.a
|
||||
@ -46,7 +50,14 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR;RISCV
|
||||
-DPERL_EXECUTABLE=$(which perl)
|
||||
-DLLVM_ENABLE_FFI=ON
|
||||
-DANDROID_NDK_VERSION=${TERMUX_NDK_VERSION_NUM}
|
||||
"
|
||||
|
||||
if [ $TERMUX_ARCH_BITS = 32 ]; then
|
||||
# Do not set _FILE_OFFSET_BITS=64
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_FORCE_SMALLFILE_FOR_ANDROID=on"
|
||||
fi
|
||||
|
||||
TERMUX_PKG_FORCE_CMAKE=true
|
||||
TERMUX_PKG_HAS_DEBUG=false
|
||||
# Debug build succeeds but make install with:
|
||||
@ -59,6 +70,8 @@ termux_step_post_get_source() {
|
||||
mv clang-tools-extra-${TERMUX_PKG_VERSION}.src tools/clang/tools/extra
|
||||
mv lld-${TERMUX_PKG_VERSION}.src tools/lld
|
||||
mv openmp-${TERMUX_PKG_VERSION}.src projects/openmp
|
||||
mv compiler-rt-${TERMUX_PKG_VERSION}.src projects/compiler-rt
|
||||
mv polly-${TERMUX_PKG_VERSION}.src tools/polly
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -9,7 +9,10 @@ bin/git-clang-format
|
||||
bin/scan-*
|
||||
include/clang*
|
||||
include/omp.h
|
||||
lib/clang
|
||||
lib/clang/*/include/*.h
|
||||
lib/clang/*/include/openmp_wrappers/
|
||||
lib/clang/*/include/ppc_wrappers/
|
||||
lib/clang/*/include/cuda_wrappers/
|
||||
lib/cmake/clang
|
||||
lib/libclang*so
|
||||
lib/libomp.a
|
||||
|
||||
13
packages/libllvm/libcompiler-rt.subpackage.sh
Normal file
13
packages/libllvm/libcompiler-rt.subpackage.sh
Normal file
@ -0,0 +1,13 @@
|
||||
TERMUX_SUBPKG_DESCRIPTION="Compiler runtime libraries for clang"
|
||||
TERMUX_SUBPKG_INCLUDE="
|
||||
lib/clang/*/bin/asan_device_setup
|
||||
lib/clang/*/bin/hwasan_symbolize
|
||||
lib/clang/*/include/fuzzer/FuzzedDataProvider.h
|
||||
lib/clang/*/include/profile/InstrProfData.inc
|
||||
lib/clang/*/include/sanitizer/
|
||||
lib/clang/*/include/xray/
|
||||
lib/clang/*/lib/android/
|
||||
lib/clang/*/share/asan_blacklist.txt
|
||||
lib/clang/*/share/cfi_blacklist.txt
|
||||
lib/clang/*/share/hwasan_blacklist.txt
|
||||
"
|
||||
6
packages/libllvm/libpolly.subpackage.sh
Normal file
6
packages/libllvm/libpolly.subpackage.sh
Normal file
@ -0,0 +1,6 @@
|
||||
TERMUX_SUBPKG_DESCRIPTION="High-level loop and data-locality optimizer for clang"
|
||||
TERMUX_SUBPKG_INCLUDE="
|
||||
include/polly/
|
||||
lib/cmake/polly/
|
||||
lib/LLVMPolly.so
|
||||
"
|
||||
30
packages/libllvm/projects-compiler-rt-CMakeLists.txt.patch
Normal file
30
packages/libllvm/projects-compiler-rt-CMakeLists.txt.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- ../projects-compiler-rt-CMakeLists.txt.orig 2020-09-22 14:12:54.771097201 +0000
|
||||
+++ ./projects/compiler-rt/CMakeLists.txt 2020-09-22 16:11:07.568559345 +0000
|
||||
@@ -182,6 +182,9 @@
|
||||
elseif (FUCHSIA)
|
||||
set(${var}_LIBNAME "libc++")
|
||||
set(${var}_INTREE 1)
|
||||
+ elseif (ANDROID)
|
||||
+ set(${var}_LIBNAME "libc++_shared")
|
||||
+ set(${var}_SYSTEM 1)
|
||||
else()
|
||||
set(${var}_LIBNAME "libstdc++")
|
||||
set(${var}_SYSTEM 1)
|
||||
@@ -196,7 +199,7 @@
|
||||
# which pulls in the ABI transitively.
|
||||
set(SANITIZER_CXX_ABI "default" CACHE STRING
|
||||
"Specify C++ ABI library to use.")
|
||||
-set(CXXABIS none default libstdc++ libc++ libcxxabi)
|
||||
+set(CXXABIS none default libc++_shared libstdc++ libc++ libcxxabi)
|
||||
set_property(CACHE SANITIZER_CXX_ABI PROPERTY STRINGS ;${CXXABIS})
|
||||
handle_default_cxx_lib(SANITIZER_CXX_ABI)
|
||||
|
||||
@@ -438,6 +441,8 @@
|
||||
list(APPEND SANITIZER_CXX_ABI_LIBRARIES "c++abi")
|
||||
elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libstdc++")
|
||||
append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_CXX_ABI_LIBRARIES)
|
||||
+elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++_shared")
|
||||
+ list(APPEND SANITIZER_CXX_ABI_LIBRARIES "c++_shared")
|
||||
endif()
|
||||
|
||||
if (SANITIZER_TEST_CXX_LIBNAME STREQUAL "libc++")
|
||||
@ -1,6 +1,15 @@
|
||||
diff -u -r ../llvm-4.0.1.src/tools/clang/lib/Driver/ToolChain.cpp ./tools/clang/lib/Driver/ToolChain.cpp
|
||||
--- ../llvm-4.0.1.src/tools/clang/lib/Driver/ToolChain.cpp 2016-12-14 17:46:50.000000000 +0100
|
||||
+++ ./tools/clang/lib/Driver/ToolChain.cpp 2017-07-13 12:35:02.862534376 +0200
|
||||
diff --git a/tools/clang/lib/Driver/ToolChain.cpp b/tools/clang/lib/Driver/ToolChain.cpp
|
||||
index 469ef62f1a9d..218f5af748f4 100644
|
||||
--- a/tools/clang/lib/Driver/ToolChain.cpp
|
||||
+++ b/tools/clang/lib/Driver/ToolChain.cpp
|
||||
@@ -374,6 +374,6 @@ StringRef ToolChain::getOSLibName() const {
|
||||
case llvm::Triple::Solaris:
|
||||
return "sunos";
|
||||
default:
|
||||
- return getOS();
|
||||
+ return Triple.isAndroid() ? "android":getOS();
|
||||
}
|
||||
}
|
||||
@@ -632,7 +632,7 @@
|
||||
|
||||
switch (Type) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user