Date: Thursday, September 20, 2018 @ 14:07:44 Author: foutrelis Revision: 383677
upgpkg: lib32-llvm 7.0.0-1 New upstream release. Modified: lib32-llvm/trunk/PKGBUILD Deleted: lib32-llvm/trunk/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch lib32-llvm/trunk/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch ---------------------------------------------------------------+ D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch | 36 ---------- D44420-cmake-fix-a-typo-in-llvm_config-macro.patch | 13 --- PKGBUILD | 18 +---- 3 files changed, 4 insertions(+), 63 deletions(-) Deleted: D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch =================================================================== --- D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch 2018-09-20 14:07:42 UTC (rev 383676) +++ D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch 2018-09-20 14:07:44 UTC (rev 383677) @@ -1,36 +0,0 @@ -From 4d613a84ce271c6225068bef67d727ae02b2e3b1 Mon Sep 17 00:00:00 2001 -From: Pavel Labath <lab...@google.com> -Date: Wed, 14 Mar 2018 09:28:38 +0000 -Subject: [PATCH] Export LLVM_DYLIB_COMPONENTS in LLVMConfig.cmake - -Summary: -This is needed so that external projects (e.g. a standalone build of -lldb) can link to the LLVM shared library via the USE_SHARED argument of -llvm_config. Without this, llvm_config would add LLVM to the link list, -but then also add the constituent static libraries, resulting in -multiply defined symbols. - -Reviewers: beanz, mgorny - -Subscribers: llvm-commits - -Differential Revision: https://reviews.llvm.org/D44391 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327484 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - cmake/modules/LLVMConfig.cmake.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cmake/modules/LLVMConfig.cmake.in b/cmake/modules/LLVMConfig.cmake.in -index fe4df5278498..e70018679846 100644 ---- a/cmake/modules/LLVMConfig.cmake.in -+++ b/cmake/modules/LLVMConfig.cmake.in -@@ -13,6 +13,8 @@ set(LLVM_COMMON_DEPENDS @LLVM_COMMON_DEPENDS@) - - set(LLVM_AVAILABLE_LIBS @LLVM_AVAILABLE_LIBS@) - -+set(LLVM_DYLIB_COMPONENTS @LLVM_DYLIB_COMPONENTS@) -+ - set(LLVM_ALL_TARGETS @LLVM_ALL_TARGETS@) - - set(LLVM_TARGETS_TO_BUILD @LLVM_TARGETS_TO_BUILD@) Deleted: D44420-cmake-fix-a-typo-in-llvm_config-macro.patch =================================================================== --- D44420-cmake-fix-a-typo-in-llvm_config-macro.patch 2018-09-20 14:07:42 UTC (rev 383676) +++ D44420-cmake-fix-a-typo-in-llvm_config-macro.patch 2018-09-20 14:07:44 UTC (rev 383677) @@ -1,13 +0,0 @@ -Index: cmake/modules/LLVM-Config.cmake -=================================================================== ---- cmake/modules/LLVM-Config.cmake -+++ cmake/modules/LLVM-Config.cmake -@@ -68,7 +68,7 @@ - cmake_parse_arguments(ARG "USE_SHARED" "" "" ${ARGN}) - set(link_components ${ARG_UNPARSED_ARGUMENTS}) - -- if(USE_SHARED) -+ if(ARG_USE_SHARED) - # If USE_SHARED is specified, then we link against libLLVM, - # but also against the component libraries below. This is - # done in case libLLVM does not contain all of the components Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-20 14:07:42 UTC (rev 383676) +++ PKGBUILD 2018-09-20 14:07:44 UTC (rev 383677) @@ -3,7 +3,7 @@ # Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> pkgname=('lib32-llvm' 'lib32-llvm-libs') -pkgver=6.0.1 +pkgver=7.0.0 pkgrel=1 arch=('x86_64') url="http://llvm.org/" @@ -11,13 +11,9 @@ makedepends=('cmake' 'ninja' 'lib32-libffi' 'lib32-zlib' 'python2' 'gcc-multilib' 'lib32-libxml2') options=('staticlibs') -source=(http://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig} - D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch - D44420-cmake-fix-a-typo-in-llvm_config-macro.patch) -sha256sums=('b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2' - 'SKIP' - '96e2f3ca8b7d1bdbe2606a1eebb12c57b39838d1bcc15e40388e8d59649a9f4a' - '5cc114fd711e6ea836a6270b2f713e2e751c49e8b5ffa6c6812127ca801acef3') +source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}) +sha256sums=('8bc1f844e6cbde1b652c19c1edebc1864456fd9c78b8c1bea038e51b363fe222' + 'SKIP') validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> @@ -24,12 +20,6 @@ prepare() { cd "$srcdir/llvm-$pkgver.src" mkdir build - - # https://reviews.llvm.org/D44391 - patch -Np1 -i ../D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch - - # https://reviews.llvm.org/D44420 - patch -Np0 -i ../D44420-cmake-fix-a-typo-in-llvm_config-macro.patch } build() {