Add disabled patch to clang
authorFredrik Fornwall <fredrik@fornwall.net>
Mon, 14 Dec 2015 00:10:44 +0000 (19:10 -0500)
committerFredrik Fornwall <fredrik@fornwall.net>
Mon, 14 Dec 2015 00:10:44 +0000 (19:10 -0500)
packages/clang/build.sh
packages/clang/compiler-rt-android.disabled [new file with mode: 0644]

index a5ebc22..47bab5d 100644 (file)
@@ -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.7
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
+# TERMUX_PKG_BUILD_REVISION=1
 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"
@@ -11,10 +12,17 @@ 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
+
        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*}
 }
diff --git a/packages/clang/compiler-rt-android.disabled b/packages/clang/compiler-rt-android.disabled
new file mode 100644 (file)
index 0000000..f45b0df
--- /dev/null
@@ -0,0 +1,13 @@
+diff -u -r ../pristine/projects/compiler-rt/CMakeLists.txt ./projects/compiler-rt/CMakeLists.txt
+--- ../pristine/projects/compiler-rt/CMakeLists.txt    2015-07-27 12:42:42.000000000 -0400
++++ ./projects/compiler-rt/CMakeLists.txt      2015-12-08 11:07:26.899747723 -0500
+@@ -147,9 +147,7 @@
+   set(COMPILER_RT_HAS_EXPLICIT_TEST_TARGET_TRIPLE FALSE)
+ endif()
+-if ("${COMPILER_RT_TEST_TARGET_ABI}" STREQUAL "androideabi")
+   set(ANDROID 1)
+-endif()
+ string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR)
+ set(COMPILER_RT_LIBRARY_OUTPUT_DIR