From 95e60146d72ee07fef4958aa517cc003a8dbef70 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 26 Feb 2017 14:52:04 +0100 Subject: [PATCH] libllvm: Bump revision, enable the clang split --- packages/libllvm/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index b824fa47a..e19378a86 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" _PKG_MAJOR_VERSION=3.9 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 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 @@ -25,7 +25,8 @@ share/scan-view " 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 +# Conflict with clang versions earlier than 3.9.1-3 since they bundled llvm. +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="