Date: Thursday, May 27, 2021 @ 13:37:24 Author: foutrelis Revision: 416533
upgpkg: llvm10 10.0.1-5: avoid CMake reference to LLVMgold.so https://bugs.archlinux.org/task/70437 Added: llvm10/trunk/utils-benchmark-fix-missing-include.patch Modified: llvm10/trunk/PKGBUILD -------------------------------------------+ PKGBUILD | 61 ++++++++++++++++++++-------- utils-benchmark-fix-missing-include.patch | 21 +++++++++ 2 files changed, 66 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-27 13:21:20 UTC (rev 416532) +++ PKGBUILD 2021-05-27 13:37:24 UTC (rev 416533) @@ -3,7 +3,7 @@ pkgname=('llvm10' 'llvm10-libs') pkgver=10.0.1 -pkgrel=4 +pkgrel=5 arch=('x86_64') url="https://llvm.org/"; license=('custom:Apache 2.0 with LLVM Exception') @@ -11,32 +11,61 @@ 'python-setuptools') options=('staticlibs') _source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver -source=($_source_base/llvm-$pkgver.src.tar.xz{,.sig}) +source=($_source_base/llvm-$pkgver.src.tar.xz{,.sig} + utils-benchmark-fix-missing-include.patch) sha256sums=('c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3' - 'SKIP') + 'SKIP' + '5f666675fd45848e4c4b0f94068f7648dd9ff88df4a7b19d2a9f2b83ee358a7e') validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <[email protected]> validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <[email protected]> +# Utilizing LLVM_DISTRIBUTION_COMPONENTS to avoid +# CMake reference to LLVMgold; inspired by Gentoo +_get_distribution_components() { + local target + ninja -t targets | grep -Po 'install-\K.*(?=-stripped:)' | while read -r target; do + case $target in + llvm-libraries|distribution) + continue + ;; + LLVMgold) + continue + ;; + esac + echo $target + done +} + prepare() { cd "$srcdir/llvm-$pkgver.src" mkdir build + patch -Np2 -i ../utils-benchmark-fix-missing-include.patch } build() { cd "$srcdir/llvm-$pkgver.src/build" - cmake .. -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_HOST_TRIPLE=$CHOST \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_INSTALL_UTILS=ON \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_ENABLE_FFI=ON \ - -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR \ - -DLLVM_BUILD_TESTS=ON \ + local cmake_args=( + -G Ninja + -DCMAKE_BUILD_TYPE=Release + -DCMAKE_INSTALL_PREFIX=/usr + -DLLVM_HOST_TRIPLE=$CHOST + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON + -DLLVM_INSTALL_UTILS=ON + -DLLVM_ENABLE_RTTI=ON + -DLLVM_ENABLE_FFI=ON + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR + -DLLVM_BUILD_TESTS=ON -DLLVM_BINUTILS_INCDIR=/usr/include + ) + + cmake .. "${cmake_args[@]}" + local distribution_components=$(_get_distribution_components | paste -sd\;) + test -n "$distribution_components" + cmake_args+=(-DLLVM_DISTRIBUTION_COMPONENTS="$distribution_components") + + cmake .. "${cmake_args[@]}" ninja } @@ -52,7 +81,7 @@ cd "$srcdir/llvm-$pkgver.src/build" - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja install-distribution # Include lit for running lit-based tests in other projects pushd ../utils/lit @@ -63,7 +92,7 @@ mv -f "$pkgdir"/usr/lib/lib{LLVM-*.so,{LTO,Remarks}.so.*} "$srcdir" # Remove files which conflict with llvm-libs - rm "$pkgdir"/usr/lib/{LLVMgold,lib{LLVM,LTO,Remarks}}.so + rm "$pkgdir"/usr/lib/lib{LLVM,LTO,Remarks}.so install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } Added: utils-benchmark-fix-missing-include.patch =================================================================== --- utils-benchmark-fix-missing-include.patch (rev 0) +++ utils-benchmark-fix-missing-include.patch 2021-05-27 13:37:24 UTC (rev 416533) @@ -0,0 +1,21 @@ +From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <[email protected]> +Date: Tue, 10 Nov 2020 14:55:25 +0100 +Subject: [PATCH] [nfc] Fix missing include + +--- + llvm/utils/benchmark/src/benchmark_register.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h +index 0705e219f2fa..4caa5ad4da07 100644 +--- a/llvm/utils/benchmark/src/benchmark_register.h ++++ b/llvm/utils/benchmark/src/benchmark_register.h +@@ -1,6 +1,7 @@ + #ifndef BENCHMARK_REGISTER_H + #define BENCHMARK_REGISTER_H + ++#include <limits> + #include <vector> + + #include "check.h"
