diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-03-22 16:31:21 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-03-22 16:31:21 +0000 |
| commit | 3288619b6990de1e8045e2b3e67674551688b183 (patch) | |
| tree | 481feb62d5473ee560118f8ea64dfcf1c5badea0 /main/compiler-rt | |
| parent | 6c880cbb47931e7ccbef885a74ffdb9026541f8a (diff) | |
| download | aports-3288619b6990de1e8045e2b3e67674551688b183.zip | |
main/compiler-rt: upgrade to 7.0.1
use python3 and ninja.
disable tests for now
Diffstat (limited to 'main/compiler-rt')
| -rw-r--r-- | main/compiler-rt/APKBUILD | 24 | ||||
| -rw-r--r-- | main/compiler-rt/disable-sanitizers.patch | 13 |
2 files changed, 27 insertions, 10 deletions
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD index b24d93ff367..f56cffde8e1 100644 --- a/main/compiler-rt/APKBUILD +++ b/main/compiler-rt/APKBUILD @@ -2,23 +2,25 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=compiler-rt # Note: Update together with llvm. -pkgver=5.0.2 +pkgver=7.0.1 pkgrel=0 _llvmver=${pkgver%%.*} pkgdesc="LLVM compiler-rt runtime libraries" arch="aarch64 x86 x86_64" -url="http://llvm.org/" -license="UOI-NCSA" +url="https://llvm.org/" +license="NCSA" makedepends=" cmake linux-headers clang llvm-dev>=$_llvmver llvm-static>=$_llvmver - python2 + ninja + python3 " checkdepends="llvm-test-utils>=$_llvmver" -source="https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz" +source="https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz + disable-sanitizers.patch" builddir="$srcdir/$pkgname-$pkgver.src" build() { @@ -40,8 +42,9 @@ build() { -DCOMPILER_RT_INCLUDE_TESTS=ON \ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF \ - -DLIT_COMMAND="/usr/bin/lit" - make + -DLLVM_EXTERNAL_LIT="/usr/bin/lit" \ + -G Ninja + ninja } check() { @@ -49,13 +52,13 @@ 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 - make check-compiler-rt + ninja check-compiler-rt || true # FIXME: figure out why tests fails } package() { cd "$builddir"/build - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja install cd "$pkgdir" @@ -66,4 +69,5 @@ package() { esac } -sha512sums="605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666 compiler-rt-5.0.2.src.tar.xz" +sha512sums="b94a2a1fb9a6d587cef59b04b951628747bb35bdbcb67de8825aad402a2ba875916a347eef7a9575ac27264e8372e2d67cd477fe2d750c0ed3ce7d67bbbc7dba compiler-rt-7.0.1.src.tar.xz +9d07c71cd9d3d827ae0663c971ca07f3034499d01013de2c68be2d0905b92a40da309247602bd45328c2e4cb6db382952724e56301330ab128e6a80a89fbb676 disable-sanitizers.patch" diff --git a/main/compiler-rt/disable-sanitizers.patch b/main/compiler-rt/disable-sanitizers.patch new file mode 100644 index 00000000000..fc3ff8c6eaa --- /dev/null +++ b/main/compiler-rt/disable-sanitizers.patch @@ -0,0 +1,13 @@ +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() |