X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/aa4a9f995f7448ff0f43fdcc87762384280ed1a1..7399cc078230b8b298fc4c7a9a42664f82a2ead5:/packages/libllvm/build.sh

diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index ab751274..558747d1 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -1,9 +1,9 @@
-TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
+TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library"
-_PKG_MAJOR_VERSION=4.0
+_PKG_MAJOR_VERSION=5.0
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
-TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
-TERMUX_PKG_SHA256=da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51
+TERMUX_PKG_SHA256=5fa7489fc0225b11821cab0362f5813a05f2bcf2533e8a4ea9c9c860168807b0
+TERMUX_PKG_SRCURL=https://releases.llvm.org/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/bugpoint
@@ -18,6 +18,8 @@ bin/sanstats
 bin/scan-build
 bin/scan-view
 lib/BugpointPasses.so
+lib/libclang*.a
+lib/libLLVM*.a
 lib/libLTO.so
 lib/LLVMHello.so
 share/man/man1/scan-build.1
@@ -31,10 +33,12 @@ TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)"
 TERMUX_PKG_REPLACES=gcc
 # See http://llvm.org/docs/CMake.html:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DPYTHON_EXECUTABLE=`which python`
 -DLLVM_ENABLE_PIC=ON
 -DLLVM_ENABLE_LIBEDIT=OFF
 -DLLVM_BUILD_TESTS=OFF
 -DLLVM_INCLUDE_TESTS=OFF
+-DCLANG_DEFAULT_CXX_STDLIB=libc++
 -DCLANG_INCLUDE_TESTS=OFF
 -DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF
 -DC_INCLUDE_DIRS=$TERMUX_PREFIX/include
@@ -42,16 +46,26 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
 -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen"
 TERMUX_PKG_FORCE_CMAKE=yes
+TERMUX_PKG_KEEP_STATIC_LIBRARIES=true
 
 termux_step_post_extract_package () {
 	local CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
 	termux_download \
-		http://llvm.org/releases/${TERMUX_PKG_VERSION}/$CLANG_SRC_TAR \
+		https://releases.llvm.org/${TERMUX_PKG_VERSION}/$CLANG_SRC_TAR \
 		$TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR \
-		61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b
+		135f6c9b0cd2da1aff2250e065946258eb699777888df39ca5a5b4fe5e23d0ff
 
 	tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
 	mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang
+
+	local LLD_SRC_TAR=lld-${TERMUX_PKG_VERSION}.src.tar.xz
+	termux_download \
+		https://llvm.org/releases/${TERMUX_PKG_VERSION}/$LLD_SRC_TAR \
+		$TERMUX_PKG_CACHEDIR/$LLD_SRC_TAR \
+		d5b36c0005824f07ab093616bdff247f3da817cae2c51371e1d1473af717d895
+
+	tar -xf $TERMUX_PKG_CACHEDIR/$LLD_SRC_TAR -C tools
+	mv tools/lld-${TERMUX_PKG_VERSION}.src tools/lld
 }
 
 termux_step_host_build () {
@@ -81,7 +95,7 @@ termux_step_pre_configure () {
 	fi
         # see CMakeLists.txt and tools/clang/CMakeLists.txt
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE"
-	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH	-DLLVM_TARGETS_TO_BUILD=$LLVM_TARGET_ARCH"
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH -DLLVM_TARGETS_TO_BUILD=all"
 }
 
 termux_step_post_make_install () {
@@ -90,6 +104,16 @@ termux_step_post_make_install () {
 	for tool in clang clang++ cc c++ cpp gcc g++ ${TERMUX_HOST_PLATFORM}-{clang,clang++,gcc,g++,cpp}; do
 		ln -f -s clang-${_PKG_MAJOR_VERSION} $tool
 	done
+
+	local OPENMP_ARCH
+	if [ $TERMUX_ARCH = "i686" ]; then
+		OPENMP_ARCH="i386"
+	else
+		OPENMP_ARCH=$TERMUX_ARCH
+	fi
+
+	local OPENMP_PATH=lib64/clang/5.0/lib/linux/$OPENMP_ARCH/libomp.a
+	cp $TERMUX_STANDALONE_TOOLCHAIN/$OPENMP_PATH $TERMUX_PREFIX/lib
 }
 
 termux_step_post_massage () {