X-Original-To: alpine-aports@lists.alpinelinux.org Received: from fx.arvanta.net (static-213-198-238-194.adsl.eunet.rs [213.198.238.194]) by lists.alpinelinux.org (Postfix) with ESMTP id C31E2F84E56 for ; Fri, 8 Feb 2019 19:07:26 +0000 (UTC) Received: from arya.arvanta.net (arya.arvanta.net [10.5.1.6]) by fx.arvanta.net (Postfix) with ESMTP id A46831BF86; Fri, 8 Feb 2019 20:07:25 +0100 (CET) From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= To: alpine-aports@lists.alpinelinux.org Cc: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= Subject: [alpine-aports] [PATCH] community/lld: upgrade to 6.0.1 Date: Fri, 8 Feb 2019 20:07:23 +0100 Message-Id: <20190208190723.5105-1-mps@arvanta.net> X-Mailer: git-send-email 2.20.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit add libxml2-dev and libexecinfo-dev to makedepends fix check() disable one test on armv7 remove unneeded cmake patch --- community/lld/APKBUILD | 16 +++- ...read-handling-for-out-of-tree-builds.patch | 80 ------------------- 2 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 community/lld/cmake-fix-pthread-handling-for-out-of-tree-builds.patch diff --git a/community/lld/APKBUILD b/community/lld/APKBUILD index 65f32d3cf4..b5900f9e51 100644 --- a/community/lld/APKBUILD +++ b/community/lld/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka # Maintainer: Jakub Jirutka pkgname=lld -pkgver=5.0.2 +pkgver=6.0.1 pkgrel=0 _llvmver=${pkgver%%.*} pkgdesc="The LLVM Linker" @@ -14,12 +14,21 @@ makedepends=" llvm-dev>=$_llvmver llvm-static>=$_llvmver llvm-test-utils=>$_llvmver - zlib-dev" + zlib-dev + libxml2-dev + libexecinfo-dev + " checkdepends="gtest gtest-dev" subpackages="$pkgname-dev" source="https://releases.llvm.org/$pkgver/$pkgname-$pkgver.src.tar.xz" builddir="$srcdir/$pkgname-$pkgver.src" +prepare() { + case "$CARCH" in + armv7) rm "$builddir"/test/COFF/manifestinput.test;; + esac +} + build() { mkdir -p "$builddir"/build cd "$builddir"/build @@ -40,6 +49,7 @@ build() { check() { cd "$builddir/build" [ "$CARCH" = "armhf" ] && return 0 + [ -f bin/llvm-lit ] || ln -s /usr/bin/lit bin/llvm-lit make check-lld } @@ -49,4 +59,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="6edafc277a5475a4b44fdf2d77bb8d0a80e8717f74c6db6c0208e0f1492a552f50640503ba8687bcd87a3d677b571dc4f9579b1e5c0bf53059c259ecbcc78c0e lld-5.0.2.src.tar.xz" +sha512sums="856ccc125255ab6184919f1424372f0f8a5de8477777047e2ab1a131a2ecec0caa9b5163d01409c7c510df9c794f0bc8d65cc904df2baf6462ef53bc163e002a lld-6.0.1.src.tar.xz" diff --git a/community/lld/cmake-fix-pthread-handling-for-out-of-tree-builds.patch b/community/lld/cmake-fix-pthread-handling-for-out-of-tree-builds.patch deleted file mode 100644 index b2a66f1a13..0000000000 --- a/community/lld/cmake-fix-pthread-handling-for-out-of-tree-builds.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 548cd5eb4f45de4ec71b3421a98c9462aed75c91 Mon Sep 17 00:00:00 2001 -From: Eric Fiselier -Date: Fri, 10 Feb 2017 01:59:20 +0000 -Subject: [PATCH] [CMake] Fix pthread handling for out-of-tree builds - -LLVM defines `PTHREAD_LIB` which is used by AddLLVM.cmake and various projects -to correctly link the threading library when needed. Unfortunately -`PTHREAD_LIB` is defined by LLVM's `config-ix.cmake` file which isn't installed -and therefore can't be used when configuring out-of-tree builds. This causes -such builds to fail since `pthread` isn't being correctly linked. - -This patch attempts to fix that problem by renaming and exporting -`LLVM_PTHREAD_LIB` as part of`LLVMConfig.cmake`. I renamed `PTHREAD_LIB` -because It seemed likely to cause collisions with downstream users of -`LLVMConfig.cmake`. - - -git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@294690 91177308-0d34-0410-b5e6-96231b3b80d8 - -Source: http://pkgs.fedoraproject.org/cgit/rpms/lld.git/tree/0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch ---- - COFF/CMakeLists.txt | 2 +- - ELF/CMakeLists.txt | 2 +- - lib/ReaderWriter/MachO/CMakeLists.txt | 2 +- - unittests/CoreTests/CMakeLists.txt | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/COFF/CMakeLists.txt b/COFF/CMakeLists.txt -index 0eebe93..8f24e36 100644 ---- a/COFF/CMakeLists.txt -+++ b/COFF/CMakeLists.txt -@@ -43,7 +43,7 @@ add_lld_library(lldCOFF - - LINK_LIBS - lldCore -- ${PTHREAD_LIB} -+ ${LLVM_PTHREAD_LIB} - - DEPENDS - COFFOptionsTableGen -diff --git a/ELF/CMakeLists.txt b/ELF/CMakeLists.txt -index 5652b93..0d1e5b2 100644 ---- a/ELF/CMakeLists.txt -+++ b/ELF/CMakeLists.txt -@@ -54,7 +54,7 @@ add_lld_library(lldELF - LINK_LIBS - lldConfig - lldCore -- ${PTHREAD_LIB} -+ ${LLVM_PTHREAD_LIB} - - DEPENDS - ELFOptionsTableGen -diff --git a/lib/ReaderWriter/MachO/CMakeLists.txt b/lib/ReaderWriter/MachO/CMakeLists.txt -index 3b06985..5a96d87 100644 ---- a/lib/ReaderWriter/MachO/CMakeLists.txt -+++ b/lib/ReaderWriter/MachO/CMakeLists.txt -@@ -28,7 +28,7 @@ add_lld_library(lldMachO - LINK_LIBS - lldCore - lldYAML -- ${PTHREAD_LIB} -+ ${LLVM_PTHREAD_LIB} - ) - - include_directories(.) -diff --git a/unittests/CoreTests/CMakeLists.txt b/unittests/CoreTests/CMakeLists.txt -index 98405d5..72e7c44 100644 ---- a/unittests/CoreTests/CMakeLists.txt -+++ b/unittests/CoreTests/CMakeLists.txt -@@ -3,5 +3,5 @@ add_lld_unittest(CoreTests - ) - - target_link_libraries(CoreTests -- ${PTHREAD_LIB} -+ ${LLVM_PTHREAD_LIB} - ) --- -1.8.3.1 - -- 2.20.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---