From 6f4957d93be4abd7447f46e1dfc49c6eee1ba3ed Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 30 Jul 2022 17:11:59 -0500 Subject: user/llvm14: Update to 14.0.6, fix issues - Install utility binaries, required by Clang test suite. - Set large thread stack size for llvm-lto2. --- user/llvm14/APKBUILD | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/user/llvm14/APKBUILD b/user/llvm14/APKBUILD index 8fe860fe1..843341fdd 100644 --- a/user/llvm14/APKBUILD +++ b/user/llvm14/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka # Maintainer: A. Wilcox _pkgname=llvm -pkgver=14.0.4 +pkgver=14.0.6 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgrel=0 @@ -15,7 +15,7 @@ license="NCSA AND (Apache-2.0 WITH LLVM-exception)" depends="" depends_dev="$pkgname=$pkgver-r$pkgrel libexecinfo-dev libxml2-dev" checkdepends="cmd:which" -makedepends="binutils-dev chrpath cmake file libexecinfo-dev libffi-dev +makedepends="binutils-dev chelf chrpath cmake file libexecinfo-dev libffi-dev libxml2-dev python3 zlib-dev" subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils" @@ -98,6 +98,7 @@ build() { -DLLVM_HOST_TRIPLE="$CHOST" \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_INSTALL_UTILS=ON \ -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Hexagon;Lanai;Mips;MSP430;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86;XCore' \ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='M68k' \ @@ -126,6 +127,10 @@ package() { | awk -F: '$2~/ELF/{print $1}' \ | xargs -r chrpath -d + # Thread 3 requires a lot of stack space to LTO when targeting ARM. + # Note that this occurs even when crossing (on a ppc64 host). + chelf -s 1048576 bin/llvm-lto2 + # Symlink files from /usr/lib/llvm*/bin to /usr/bin. mkdir -p "$pkgdir"/usr/bin local name newname path @@ -229,7 +234,7 @@ _mv() { mv $@ } -sha512sums="f15a8f1b9067d9f3fb2837f04bf6137218d0d0fd9dbd51b40a046675ed194c4c51b084643014180b7a72c2475f87f5784bed9f9940c326c2e5e264114dde4e5b llvm-14.0.4.src.tar.xz +sha512sums="6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d llvm-14.0.6.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