diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/llvm4/APKBUILD | 6 | ||||
| -rw-r--r-- | main/llvm4/fix-CheckAtomic.cmake.patch | 22 |
2 files changed, 26 insertions, 2 deletions
diff --git a/main/llvm4/APKBUILD b/main/llvm4/APKBUILD index 795141d95e..9643ca1de3 100644 --- a/main/llvm4/APKBUILD +++ b/main/llvm4/APKBUILD @@ -6,7 +6,7 @@ _pkgname=llvm pkgver=4.0.0 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system (version $_majorver)" arch="all" url="http://llvm.org/" @@ -22,6 +22,7 @@ source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz cmake-fix-libLLVM-name.patch disable-FileSystemTest.CreateDir-perms-assert.patch silent-amdgpu-test-failing.patch + fix-CheckAtomic.cmake.patch " builddir="$srcdir/$_pkgname-$pkgver.src" @@ -210,4 +211,5 @@ sha512sums="cf681f0626ef6d568d951cdc3e143471a1d7715a0ba11e52aa273cf5d8d421e1357e 19bfb9282455d39d07dbb2b1293b03a45c57d522fbb9c5e58dac034200669628b97e7a90cd4ff5d52d9bb79acfccbef653d8a1140a7f0589ecd6f9b7c4ba0eb6 llvm-fix-DynamicLibrary-to-build-with-musl-libc.patch 6d1a716e5aa24e6b9a3acf4cc11e2504b1b01abf574074e9e5617b991de87d5e4e687eb18e85e73d5e632568afe2fc357771c4c96f9e136502071991496fb78c cmake-fix-libLLVM-name.patch 49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSystemTest.CreateDir-perms-assert.patch -97f788110abbb9e6add2e3a3d3b606dc2817ab726b74ead71241fc5433ba42d5d58e23be91a3b2444eb687c4f56a7c879bf5453e96f9785ce3541301329dda9c silent-amdgpu-test-failing.patch" +97f788110abbb9e6add2e3a3d3b606dc2817ab726b74ead71241fc5433ba42d5d58e23be91a3b2444eb687c4f56a7c879bf5453e96f9785ce3541301329dda9c silent-amdgpu-test-failing.patch +3bcfeccc1f14567f99029a131b1289290226d48855857f2eb6a251e041981a8b8b2d7965099df16ebf0a406e48130679f97235ef3f3524577413bb51cf40e613 fix-CheckAtomic.cmake.patch" diff --git a/main/llvm4/fix-CheckAtomic.cmake.patch b/main/llvm4/fix-CheckAtomic.cmake.patch new file mode 100644 index 0000000000..a5309de6cf --- /dev/null +++ b/main/llvm4/fix-CheckAtomic.cmake.patch @@ -0,0 +1,22 @@ +This cmake file uses command CHECK_LIBRARY_EXISTS that is defined in +module CheckLibraryExists, but it does not include that module. + +This caused build error in lldb, but only on x86 (not x86_64)... + + -- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed + CMake Error at /usr/lib/llvm4/lib/cmake/llvm/CheckAtomic.cmake:66 (check_library_exists): + Unknown CMake command "check_library_exists". + Call Stack (most recent call first): + cmake/modules/LLDBStandalone.cmake:90 (include) + CMakeLists.txt:3 (include) + +--- a/cmake/modules/CheckAtomic.cmake ++++ b/cmake/modules/CheckAtomic.cmake +@@ -1,6 +1,7 @@ + # atomic builtins are required for threading support. + + INCLUDE(CheckCXXSourceCompiles) ++INCLUDE(CheckLibraryExists) + + # Sometimes linking against libatomic is required for atomic ops, if + # the platform doesn't support lock-free atomics. |