diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-06-07 16:00:45 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-11 13:35:29 +0000 |
| commit | 13a7fe513fc0c3824d60b9fb4644cc58263414e1 (patch) | |
| tree | 6c6acb8638c12e851cb2c2e4bec2ddf65ef242a3 /main | |
| parent | 22a88a05589d3c21d97d53390e39ae7334bd8539 (diff) | |
| download | aports-13a7fe513fc0c3824d60b9fb4644cc58263414e1.zip | |
main/compiler-rt: upgrade to 8.0.0
Diffstat (limited to 'main')
| -rw-r--r-- | main/compiler-rt/APKBUILD | 18 | ||||
| -rw-r--r-- | main/compiler-rt/disable-sanitizers.patch | 13 |
2 files changed, 10 insertions, 21 deletions
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD index f56cffde8e1..8d6a171a869 100644 --- a/main/compiler-rt/APKBUILD +++ b/main/compiler-rt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=compiler-rt # Note: Update together with llvm. -pkgver=7.0.1 +pkgver=8.0.0 pkgrel=0 _llvmver=${pkgver%%.*} pkgdesc="LLVM compiler-rt runtime libraries" @@ -18,9 +18,11 @@ makedepends=" ninja python3 " -checkdepends="llvm-test-utils>=$_llvmver" +checkdepends="gtest-dev llvm-test-utils>=$_llvmver" +subpackages="$pkgname-static" +options="!check" # Doesn't seem to work with linux ld: /lib/ld-musl-x86_64.so.1: cannot load --version: No such file or directory source="https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz - disable-sanitizers.patch" + https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz" builddir="$srcdir/$pkgname-$pkgver.src" build() { @@ -29,20 +31,20 @@ build() { # compiler-rt uses llvm intrinsic types for testing # and therefore requires clang + # It also needs LLVM source for testing purposes cmake .. \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ - \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \ -DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - \ -DCOMPILER_RT_INCLUDE_TESTS=ON \ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF \ -DLLVM_EXTERNAL_LIT="/usr/bin/lit" \ + -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src" \ -G Ninja ninja } @@ -52,7 +54,7 @@ check() { # remove test that does not work with PaX kernel rm ../test/builtins/Unit/enable_execute_stack_test.c \ ../test/builtins/Unit/clear_cache_test.c - ninja check-compiler-rt || true # FIXME: figure out why tests fails + ninja check-compiler-rt } package() { @@ -69,5 +71,5 @@ package() { esac } -sha512sums="b94a2a1fb9a6d587cef59b04b951628747bb35bdbcb67de8825aad402a2ba875916a347eef7a9575ac27264e8372e2d67cd477fe2d750c0ed3ce7d67bbbc7dba compiler-rt-7.0.1.src.tar.xz -9d07c71cd9d3d827ae0663c971ca07f3034499d01013de2c68be2d0905b92a40da309247602bd45328c2e4cb6db382952724e56301330ab128e6a80a89fbb676 disable-sanitizers.patch" +sha512sums="fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913 compiler-rt-8.0.0.src.tar.xz +1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f llvm-8.0.0.src.tar.xz" diff --git a/main/compiler-rt/disable-sanitizers.patch b/main/compiler-rt/disable-sanitizers.patch deleted file mode 100644 index fc3ff8c6eaa..00000000000 --- a/main/compiler-rt/disable-sanitizers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake -index f3935ff..32bd8ef 100644 ---- a/cmake/config-ix.cmake -+++ b/cmake/config-ix.cmake -@@ -502,7 +502,7 @@ list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}") - if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND - (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Fuchsia|SunOS" OR - (OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN)))) -- set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE) -+ set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE) - else() - set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE) - endif() |