TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
-_PKG_MAJOR_VERSION=3.8
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
+_PKG_MAJOR_VERSION=3.9
+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=1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee
TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_RM_AFTER_INSTALL="bin/macho-dump bin/bugpoint bin/llvm-tblgen lib/BugpointPasses.so lib/LLVMHello.so"
-TERMUX_PKG_DEPENDS="binutils, libgnustl, ncurses, ndk-sysroot"
+TERMUX_PKG_DEPENDS="binutils, ncurses, ndk-sysroot, ndk-stl, libgcc"
+# Replace gcc since gcc is deprecated by google on android and is not maintained upstream.
+TERMUX_PKG_CONFLICTS=gcc
+TERMUX_PKG_REPLACES=gcc
+# We would like to use LLVM_LINK_LLVM_DYLIB instead of BUILD_SHARED_LIBS,
+# as http://llvm.org/docs/CMake.html says
+# "BUILD_SHARED_LIBS is only recommended for use by LLVM developers. If you want
+# to build LLVM as a shared library, you should use the LLVM_BUILD_LLVM_DYLIB option."
+# and using fewer shared libraries will make it easier to split up llvm from clang.
+# But switching to LLVM_LINK_LLVM_DYLIB currently causes linker errors.
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DLLVM_ENABLE_PIC=ON
+-DLLVM_BUILD_TESTS=OFF
+-DLLVM_INCLUDE_TESTS=OFF
+-DCLANG_INCLUDE_TESTS=OFF
+-DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF
+-DC_INCLUDE_DIRS=$TERMUX_PREFIX/include
+-DBUILD_SHARED_LIBS=ON
+-DPYTHON_EXECUTABLE=`which python2.7`
+-DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
+-DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen"
+TERMUX_PKG_FORCE_CMAKE=yes
termux_step_post_extract_package () {
CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
- test ! -f $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR && curl http://llvm.org/releases/${TERMUX_PKG_VERSION}/$CLANG_SRC_TAR > $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR
-
- # COMPILERRT_SRC_TAR=compiler-rt-${TERMUX_PKG_VERSION}.src.tar.xz
- # test ! -f $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR && curl http://llvm.org/releases/${TERMUX_PKG_VERSION}/${COMPILERRT_SRC_TAR} > $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR
-
- cd $TERMUX_PKG_SRCDIR
+ test ! -f $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR && termux_download http://llvm.org/releases/${TERMUX_PKG_VERSION}/$CLANG_SRC_TAR \
+ $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR \
+ e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63
tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang
-
- # tar -xf $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR -C projects
- # mv projects/compiler-rt-${TERMUX_PKG_VERSION}.src projects/compiler-rt
-
- # Remove symlinks which are not overwritten on repeated builds even with CMAKE_INSTALL_ALWAYS=1:
- rm -f $TERMUX_PREFIX/{bin/llvm*,lib/libLLVM*,lib/libclang*}
}
termux_step_host_build () {
- cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR
- make -j $TERMUX_MAKE_PROCESSES V=1
+ termux_setup_cmake
+ cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \
+ -DLLVM_BUILD_TESTS=OFF \
+ -DLLVM_INCLUDE_TESTS=OFF
+ make -j $TERMUX_MAKE_PROCESSES clang-tblgen llvm-tblgen
}
-termux_step_configure () {
+termux_step_pre_configure () {
cd $TERMUX_PKG_BUILDDIR
- LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
- LLVM_TARGET_ARCH=$TERMUX_ARCH
- if [ $TERMUX_ARCH = "arm" ]; then
- LLVM_TARGET_ARCH=ARM
- LLVM_DEFAULT_TARGET_TRIPLE="armv7a-linux-androideabihf"
- elif [ $TERMUX_ARCH = "i686" ]; then
- LLVM_TARGET_ARCH=X86
+ LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
+ if [ $TERMUX_ARCH = "arm" ]; then
+ LLVM_TARGET_ARCH=ARM
+ # See https://github.com/termux/termux-packages/issues/282
+ LLVM_DEFAULT_TARGET_TRIPLE="armv7a-linux-androideabi"
elif [ $TERMUX_ARCH = "aarch64" ]; then
LLVM_TARGET_ARCH=AArch64
- LLVM_DEFAULT_TARGET_TRIPLE="aarch64-linux-android"
- fi
+ elif [ $TERMUX_ARCH = "i686" ]; then
+ LLVM_TARGET_ARCH=X86
+ elif [ $TERMUX_ARCH = "x86_64" ]; then
+ LLVM_TARGET_ARCH=X86
+ else
+ echo "Invalid arch: $TERMUX_ARCH"
+ exit 1
+ fi
# see CMakeLists.txt and tools/clang/CMakeLists.txt
- cmake -G "Unix Makefiles" .. \
- -DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
- -DCMAKE_BUILD_TYPE=MinSizeRel \
- -DCMAKE_CROSSCOMPILING=True \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS -lgnustl_shared" \
- -DCMAKE_INSTALL_ALWAYS=1 \
- -DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \
- -DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
- -DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
- -DCMAKE_SYSTEM_NAME=Linux \
- -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen \
- -DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE \
- -DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH \
- -DLLVM_TARGETS_TO_BUILD=$LLVM_TARGET_ARCH \
- -DLLVM_ENABLE_PIC=ON \
- -DLLVM_INCLUDE_TESTS=Off \
- -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen \
- -DC_INCLUDE_DIRS=$TERMUX_PREFIX/include \
- -DBUILD_SHARED_LIBS=On \
- $TERMUX_PKG_SRCDIR
+ 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_step_post_make_install () {
- (cd $TERMUX_PREFIX/bin && rm -f clang clang++ && ln -s clang-${_PKG_MAJOR_VERSION} clang && ln -s clang-${_PKG_MAJOR_VERSION} clang++)
+ cd $TERMUX_PREFIX/bin
+
+ 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
}
~mdw / termux-packages / blobdiff