[arch-commits] Commit in llvm/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Sep 20 00:54:01 UTC 2018
Date: Thursday, September 20, 2018 @ 00:54:00
Author: foutrelis
Revision: 335047
upgpkg: llvm 7.0.0-1
New upstream release.
Modified:
llvm/trunk/PKGBUILD
Deleted:
llvm/trunk/D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch
llvm/trunk/D44420-cmake-fix-a-typo-in-llvm_config-macro.patch
llvm/trunk/D50416-cmake-Prevent-LLVMgold.so-from-being-unloaded-on-Lin.patch
-------------------------------------------------------------------+
D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch | 36 ----------
D44420-cmake-fix-a-typo-in-llvm_config-macro.patch | 13 ---
D50416-cmake-Prevent-LLVMgold.so-from-being-unloaded-on-Lin.patch | 28 -------
PKGBUILD | 22 ------
4 files changed, 3 insertions(+), 96 deletions(-)
Deleted: D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch
===================================================================
--- D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch 2018-09-19 23:08:52 UTC (rev 335046)
+++ D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch 2018-09-20 00:54:00 UTC (rev 335047)
@@ -1,36 +0,0 @@
-From 4d613a84ce271c6225068bef67d727ae02b2e3b1 Mon Sep 17 00:00:00 2001
-From: Pavel Labath <labath at 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-19 23:08:52 UTC (rev 335046)
+++ D44420-cmake-fix-a-typo-in-llvm_config-macro.patch 2018-09-20 00:54:00 UTC (rev 335047)
@@ -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
Deleted: D50416-cmake-Prevent-LLVMgold.so-from-being-unloaded-on-Lin.patch
===================================================================
--- D50416-cmake-Prevent-LLVMgold.so-from-being-unloaded-on-Lin.patch 2018-09-19 23:08:52 UTC (rev 335046)
+++ D50416-cmake-Prevent-LLVMgold.so-from-being-unloaded-on-Lin.patch 2018-09-20 00:54:00 UTC (rev 335047)
@@ -1,28 +0,0 @@
-From 4961e6f4874713052bc0b777742268b89929a356 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Wed, 8 Aug 2018 01:40:26 +0300
-Subject: [PATCH] [cmake] Prevent LLVMgold.so from being unloaded on Linux
-
-Extend the fix from D40459 to also apply to modules such as the LLVM
-gold plugin. This is needed because current binutils master (and future
-binutils 2.32) calls dlclose() on bfd plugins as part of a recent fix
-for PR23460 (https://sourceware.org/bugzilla/show_bug.cgi?id=23460).
----
- cmake/modules/HandleLLVMOptions.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
-index 5fd318f0..05cf9026 100644
---- a/cmake/modules/HandleLLVMOptions.cmake
-+++ b/cmake/modules/HandleLLVMOptions.cmake
-@@ -149,6 +149,7 @@ endif()
- # is unloaded.
- if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete")
-+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,nodelete")
- endif()
-
-
---
-2.18.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-19 23:08:52 UTC (rev 335046)
+++ PKGBUILD 2018-09-20 00:54:00 UTC (rev 335047)
@@ -2,8 +2,8 @@
# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
pkgname=('llvm' 'llvm-libs' 'llvm-ocaml')
-pkgver=6.0.1
-pkgrel=4
+pkgver=7.0.0
+pkgrel=1
_ocaml_ver=4.07.0
arch=('x86_64')
url="https://llvm.org/"
@@ -12,15 +12,9 @@
"ocaml=$_ocaml_ver" 'ocaml-ctypes' 'ocaml-findlib')
options=('staticlibs')
source=(https://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
- D50416-cmake-Prevent-LLVMgold.so-from-being-unloaded-on-Lin.patch
llvm-config.h)
-sha256sums=('b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2'
+sha256sums=('8bc1f844e6cbde1b652c19c1edebc1864456fd9c78b8c1bea038e51b363fe222'
'SKIP'
- '96e2f3ca8b7d1bdbe2606a1eebb12c57b39838d1bcc15e40388e8d59649a9f4a'
- '5cc114fd711e6ea836a6270b2f713e2e751c49e8b5ffa6c6812127ca801acef3'
- '4be3c981e1eac0e3d9cbfd98f2763ff8f72f7636d1cb8dca599c8c5d824d1fbb'
'597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
@@ -28,16 +22,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
-
- # https://reviews.llvm.org/D50416
- # https://sourceware.org/bugzilla/show_bug.cgi?id=23460#c10
- patch -Np1 -i ../D50416-cmake-Prevent-LLVMgold.so-from-being-unloaded-on-Lin.patch
}
build() {
More information about the arch-commits
mailing list