Update clang to 3.7.0

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index c7a239cc61ce7c47278c04be4fa058bd9138065f..211eda88095e1d9132f1ffe8aed9259a90367059 100644 (file)
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"

-_PKG_MAJOR_VERSION=3.6
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.2
-TERMUX_PKG_BUILD_REVISION=1
+_PKG_MAJOR_VERSION=3.7
+TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0

 TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 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_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="bin/macho-dump bin/bugpoint bin/llvm-tblgen lib/BugpointPasses.so lib/LLVMHello.so"


@@ -15,6 +14,9 @@ termux_step_post_extract_package () {
        cd $TERMUX_PKG_SRCDIR
        tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
        mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang
        cd $TERMUX_PKG_SRCDIR
        tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
        mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang

+
+       # 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 () {
 }
 
 termux_step_host_build () {


@@ -40,6 +42,7 @@ termux_step_configure () {
                 -DCMAKE_BUILD_TYPE=MinSizeRel \
                -DCMAKE_CROSSCOMPILING=True \
                -DCMAKE_CXX_FLAGS="$CXXFLAGS -lgnustl_shared" \
                 -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_INSTALL_PREFIX=$TERMUX_PREFIX \
                -DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
                -DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \

diff --git a/packages/clang/tools-clang-lib-Driver-ToolChains.cpp.patch b/packages/clang/tools-clang-lib-Driver-ToolChains.cpp.patch
new file mode 100644 (file)
index 0000000..09c3f2a
--- /dev/null
+++ b/packages/clang/tools-clang-lib-Driver-ToolChains.cpp.patch
@@ -0,0 +1,15 @@
+See http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20150302/124624.html
+where PIE as default on Android was removed. This patch brings it back.
+
+diff -u -r ../llvm-3.7.0.src/tools/clang/lib/Driver/ToolChains.cpp ./tools/clang/lib/Driver/ToolChains.cpp
+--- ../llvm-3.7.0.src/tools/clang/lib/Driver/ToolChains.cpp    2015-07-13 19:27:56.000000000 -0400
++++ ./tools/clang/lib/Driver/ToolChains.cpp    2015-09-04 10:38:53.984720577 -0400
+@@ -3598,7 +3598,7 @@
+   }
+ }
+ 
+-bool Linux::isPIEDefault() const { return getSanitizerArgs().requiresPIE(); }
++bool Linux::isPIEDefault() const { return true; }
+ 
+ SanitizerMask Linux::getSupportedSanitizers() const {
+   const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;