From 2faa2a984fc0903db72fc3903422c91cbe00020e Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 9 Aug 2019 08:16:47 +0000
Subject: user/llvm8: bump to 8.0.1

---
 user/llvm8/APKBUILD | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

(limited to 'user/llvm8/APKBUILD')

diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD
index 21e3267b6..6913646a3 100644
--- a/user/llvm8/APKBUILD
+++ b/user/llvm8/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 _pkgname=llvm
-pkgver=8.0.0
+pkgver=8.0.1
 _majorver=${pkgver%%.*}
 pkgname=$_pkgname$_majorver
 pkgrel=0
@@ -17,7 +17,7 @@ makedepends="binutils-dev chrpath cmake file libexecinfo-dev libffi-dev
 	libxml2-dev python3 zlib-dev"
 subpackages="$pkgname-static $pkgname-libs $pkgname-dev
 	$pkgname-test-utils:_test_utils"
-source="https://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz
 	llvm-fix-build-with-musl-libc.patch
 	disable-FileSystemTest.CreateDir-perms-assert.patch
 	disable-dlclose-test.patch
@@ -67,13 +67,9 @@ prepare() {
 
 	# https://bugs.llvm.org//show_bug.cgi?id=31870
 	rm test/tools/llvm-symbolizer/print_context.c
-
-	mkdir -p "$builddir"/build
 }
 
 build() {
-	cd "$builddir"/build
-
 	# Auto-detect it by guessing either.
 	local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
 
@@ -102,32 +98,23 @@ build() {
 		-DLLVM_INCLUDE_EXAMPLES=OFF \
 		-DLLVM_LINK_LLVM_DYLIB=ON \
 		-DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Hexagon;Lanai;Mips;MSP430;PowerPC;Sparc;SystemZ;WebAssembly;X86;XCore' \
-		"$builddir"
+		-Bbuild .
 
-	make llvm-tblgen
-	make
+	make -C build llvm-tblgen
+	make -C build
 
-	python3 ../utils/lit/setup.py build
+	python3 utils/lit/setup.py build
 }
 
 check() {
-	cd "$builddir"/build
-
 	# appears to be an issue on musl and glibc, but only fails on musl:
 	# https://github.com/NixOS/nixpkgs/blob/bb7e9e46/pkgs/development/compilers/llvm/8/llvm.nix#L74
 	rm "$builddir"/test/CodeGen/AArch64/wineh4.mir
-	# FIXME: Few tests fail on s390x, ignore it for now. See build log
-	# https://gist.github.com/jirutka/6edc951ad5b8002cf1780546cf661edc
-	case "$CARCH" in
-		s390x) make check-llvm || true;;
-		*) make check-llvm;;
-	esac
+	make -C build check-llvm
 }
 
 package() {
-	cd "$builddir"/build
-
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 
 	cd "$pkgdir"/$_prefix
 
@@ -239,7 +226,7 @@ _mv() {
 	mv $@
 }
 
-sha512sums="1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f  llvm-8.0.0.src.tar.xz
+sha512sums="82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16  llvm-8.0.1.src.tar.xz
 f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71  llvm-fix-build-with-musl-libc.patch
 49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a  disable-FileSystemTest.CreateDir-perms-assert.patch
 caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60cc2eca59e4c5b2a61d29827a2f3362ee7c5f74f11d9ace200  disable-dlclose-test.patch
-- 
cgit v1.2.3-60-g2f50