X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e19791bbc2be23f81d2947c9bd9a05f084b215fb..49e8e8c406add9637ce7409f3c4c04e606ac118a:/packages/libllvm/build.sh

diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index 656bd18b..80bba8e8 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library"
 _PKG_MAJOR_VERSION=4.0
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
+TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
-TERMUX_PKG_SHA256=8d10511df96e73b8ff9e7abbfb4d4d432edbdbe965f1f4f07afaf370b8a533be
+TERMUX_PKG_SHA256=da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/bugpoint
@@ -18,6 +19,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,9 +34,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
@@ -41,13 +47,14 @@ 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 \
 		$TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR \
-		cea5f88ebddb30e296ca89130c83b9d46c2d833685e2912303c828054c4dc98a
+		61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b
 
 	tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
 	mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang
@@ -63,7 +70,8 @@ termux_step_host_build () {
 
 termux_step_pre_configure () {
 	cd $TERMUX_PKG_BUILDDIR
-	local LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
+	export LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
+	export LLVM_TARGET_ARCH
 	if [ $TERMUX_ARCH = "arm" ]; then
 		LLVM_TARGET_ARCH=ARM
 		# See https://github.com/termux/termux-packages/issues/282
@@ -88,4 +96,25 @@ 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 () {
+	sed $TERMUX_PKG_BUILDER_DIR/llvm-config.in \
+		-e "s|@_PKG_MAJOR_VERSION@|$_PKG_MAJOR_VERSION|g" \
+		-e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \
+		-e "s|@TERMUX_PKG_SRCDIR@|$TERMUX_PKG_SRCDIR|g" \
+		-e "s|@LLVM_TARGET_ARCH@|$LLVM_TARGET_ARCH|g" \
+		-e "s|@LLVM_DEFAULT_TARGET_TRIPLE@|$LLVM_DEFAULT_TARGET_TRIPLE|g" \
+		-e "s|@TERMUX_ARCH@|$TERMUX_ARCH|g" > $TERMUX_PREFIX/bin/llvm-config
+	chmod 755 $TERMUX_PREFIX/bin/llvm-config
 }