Date: Monday, September 6, 2021 @ 15:42:49 Author: foutrelis Revision: 423475
archrelease: copy trunk to extra-x86_64 Added: llvm10/repos/extra-x86_64/PKGBUILD (from rev 423474, llvm10/trunk/PKGBUILD) llvm10/repos/extra-x86_64/no-strict-aliasing-DwarfCompileUnit.patch (from rev 423474, llvm10/trunk/no-strict-aliasing-DwarfCompileUnit.patch) llvm10/repos/extra-x86_64/utils-benchmark-fix-missing-include.patch (from rev 423474, llvm10/trunk/utils-benchmark-fix-missing-include.patch) Deleted: llvm10/repos/extra-x86_64/PKGBUILD llvm10/repos/extra-x86_64/no-strict-aliasing-DwarfCompileUnit.patch llvm10/repos/extra-x86_64/utils-benchmark-fix-missing-include.patch -------------------------------------------+ PKGBUILD | 232 ++++++++++++++-------------- no-strict-aliasing-DwarfCompileUnit.patch | 26 +-- utils-benchmark-fix-missing-include.patch | 42 ++--- 3 files changed, 150 insertions(+), 150 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-09-06 15:42:42 UTC (rev 423474) +++ PKGBUILD 2021-09-06 15:42:49 UTC (rev 423475) @@ -1,116 +0,0 @@ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> - -pkgname=('llvm10' 'llvm10-libs') -pkgver=10.0.1 -pkgrel=6 -arch=('x86_64') -url="https://llvm.org/" -license=('custom:Apache 2.0 with LLVM Exception') -makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' - '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} - utils-benchmark-fix-missing-include.patch - no-strict-aliasing-DwarfCompileUnit.patch) -sha256sums=('c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3' - 'SKIP' - '5f666675fd45848e4c4b0f94068f7648dd9ff88df4a7b19d2a9f2b83ee358a7e' - 'd1eff24508e35aae6c26a943dbaa3ef5acb60a145b008fd1ef9ac6f6c4faa662') -validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> -validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> - -# 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 - - # https://bugs.llvm.org/show_bug.cgi?id=50611#c3 - patch -Np2 -i ../no-strict-aliasing-DwarfCompileUnit.patch -} - -build() { - cd "$srcdir/llvm-$pkgver.src/build" - - 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 -} - -check() { - cd "$srcdir/llvm-$pkgver.src/build" - ninja check -} - -package_llvm10() { - pkgdesc="Collection of modular and reusable compiler and toolchain technologies" - depends=('llvm10-libs' 'perl') - conflicts=('llvm') - - cd "$srcdir/llvm-$pkgver.src/build" - - DESTDIR="$pkgdir" ninja install-distribution - - # Include lit for running lit-based tests in other projects - pushd ../utils/lit - python3 setup.py install --root="$pkgdir" -O1 - popd - - # The runtime libraries go into llvm10-libs - mv -f "$pkgdir"/usr/lib/lib{LLVM-*.so,{LTO,Remarks}.so.*} "$srcdir" - - # Remove files which conflict with llvm-libs - rm "$pkgdir"/usr/lib/lib{LLVM,LTO,Remarks}.so - - install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm10-libs() { - pkgdesc="LLVM 10 runtime libraries" - depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2') - - install -d "$pkgdir/usr/lib" - cp -P "$srcdir"/lib{LLVM-*.so,{LTO,Remarks}.so.*} "$pkgdir/usr/lib/" - - install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: Copied: llvm10/repos/extra-x86_64/PKGBUILD (from rev 423474, llvm10/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-09-06 15:42:49 UTC (rev 423475) @@ -0,0 +1,116 @@ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> + +pkgname=('llvm10' 'llvm10-libs') +pkgver=10.0.1 +pkgrel=7 +arch=('x86_64') +url="https://llvm.org/" +license=('custom:Apache 2.0 with LLVM Exception') +makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' + '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} + utils-benchmark-fix-missing-include.patch + no-strict-aliasing-DwarfCompileUnit.patch) +sha256sums=('c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3' + 'SKIP' + '5f666675fd45848e4c4b0f94068f7648dd9ff88df4a7b19d2a9f2b83ee358a7e' + 'd1eff24508e35aae6c26a943dbaa3ef5acb60a145b008fd1ef9ac6f6c4faa662') +validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> +validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> + +# 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 + + # https://bugs.llvm.org/show_bug.cgi?id=50611#c3 + patch -Np2 -i ../no-strict-aliasing-DwarfCompileUnit.patch +} + +build() { + cd "$srcdir/llvm-$pkgver.src/build" + + 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 +} + +check() { + cd "$srcdir/llvm-$pkgver.src/build" + ninja check +} + +package_llvm10() { + pkgdesc="Collection of modular and reusable compiler and toolchain technologies" + depends=('llvm10-libs' 'perl') + conflicts=('llvm' 'llvm11') + + cd "$srcdir/llvm-$pkgver.src/build" + + DESTDIR="$pkgdir" ninja install-distribution + + # Include lit for running lit-based tests in other projects + pushd ../utils/lit + python3 setup.py install --root="$pkgdir" -O1 + popd + + # The runtime libraries go into llvm10-libs + mv -f "$pkgdir"/usr/lib/lib{LLVM-*.so,{LTO,Remarks}.so.*} "$srcdir" + + # Remove files which conflict with llvm-libs + rm "$pkgdir"/usr/lib/lib{LLVM,LTO,Remarks}.so + + install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_llvm10-libs() { + pkgdesc="LLVM 10 runtime libraries" + depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2') + + install -d "$pkgdir/usr/lib" + cp -P "$srcdir"/lib{LLVM-*.so,{LTO,Remarks}.so.*} "$pkgdir/usr/lib/" + + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: Deleted: no-strict-aliasing-DwarfCompileUnit.patch =================================================================== --- no-strict-aliasing-DwarfCompileUnit.patch 2021-09-06 15:42:42 UTC (rev 423474) +++ no-strict-aliasing-DwarfCompileUnit.patch 2021-09-06 15:42:49 UTC (rev 423475) @@ -1,13 +0,0 @@ -diff --git a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt -index eb924282a75e..85929b54d6ce 100644 ---- a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt -+++ b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt -@@ -44,3 +44,8 @@ add_llvm_component_library(LLVMAsmPrinter - Support - Target - ) -+ -+# https://bugs.llvm.org/show_bug.cgi?id=50611#c3 -+if (CMAKE_COMPILER_IS_GNUCXX) -+ set_source_files_properties(DwarfCompileUnit.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) -+endif() Copied: llvm10/repos/extra-x86_64/no-strict-aliasing-DwarfCompileUnit.patch (from rev 423474, llvm10/trunk/no-strict-aliasing-DwarfCompileUnit.patch) =================================================================== --- no-strict-aliasing-DwarfCompileUnit.patch (rev 0) +++ no-strict-aliasing-DwarfCompileUnit.patch 2021-09-06 15:42:49 UTC (rev 423475) @@ -0,0 +1,13 @@ +diff --git a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt +index eb924282a75e..85929b54d6ce 100644 +--- a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt ++++ b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt +@@ -44,3 +44,8 @@ add_llvm_component_library(LLVMAsmPrinter + Support + Target + ) ++ ++# https://bugs.llvm.org/show_bug.cgi?id=50611#c3 ++if (CMAKE_COMPILER_IS_GNUCXX) ++ set_source_files_properties(DwarfCompileUnit.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) ++endif() Deleted: utils-benchmark-fix-missing-include.patch =================================================================== --- utils-benchmark-fix-missing-include.patch 2021-09-06 15:42:42 UTC (rev 423474) +++ utils-benchmark-fix-missing-include.patch 2021-09-06 15:42:49 UTC (rev 423475) @@ -1,21 +0,0 @@ -From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille <sguel...@redhat.com> -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" Copied: llvm10/repos/extra-x86_64/utils-benchmark-fix-missing-include.patch (from rev 423474, llvm10/trunk/utils-benchmark-fix-missing-include.patch) =================================================================== --- utils-benchmark-fix-missing-include.patch (rev 0) +++ utils-benchmark-fix-missing-include.patch 2021-09-06 15:42:49 UTC (rev 423475) @@ -0,0 +1,21 @@ +From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <sguel...@redhat.com> +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"