lua: Add missing trailing slash

[termux-packages] / packages / clang / build.sh

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index 2ccf201..629f29d 100644 (file)
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
 _PKG_MAJOR_VERSION=3.9
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
+TERMUX_PKG_REVISION=1
 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
@@ -10,6 +11,11 @@ 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
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_INSTALL_ALWAYS=1 -DLLVM_ENABLE_PIC=ON -DLLVM_BUILD_TESTS=OFF"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_INCLUDE_TESTS=OFF -DCLANG_INCLUDE_TESTS=OFF -DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DBUILD_SHARED_LIBS=ON -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -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
@@ -37,7 +43,7 @@ termux_step_host_build () {
        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
        if [ $TERMUX_ARCH = "arm" ]; then
@@ -55,34 +61,14 @@ termux_step_configure () {
                exit 1
        fi
         # see CMakeLists.txt and tools/clang/CMakeLists.txt
-       cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \
-               -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=Android \
-               -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_BUILD_TESTS=OFF \
-               -DLLVM_INCLUDE_TESTS=OFF \
-               -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen \
-               -DCLANG_INCLUDE_TESTS=OFF \
-               -DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF \
-               -DC_INCLUDE_DIRS=$TERMUX_PREFIX/include \
-               -DBUILD_SHARED_LIBS=ON
+       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
 
-       for tool in clang clang++ cc c++ cpp gcc g++ ${TERMUX_HOST_PLATFORM}-{gcc,g++,cpp}; do
+       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
 }