mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 13:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/llvm-libunwind: upgrade to 4.0.0

Browse Source
This commit is contained in:
Shiz 2017-05-16 02:59:32 +02:00 committed by Jakub Jirutka
parent 658eb1da4c
commit 003a5bc19e
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
community/llvm-libunwind/APKBUILD
View File

@ -2,9 +2,9 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=llvm-libunwind pkgname=llvm-libunwind
_pkgname=libunwind _pkgname=libunwind
pkgver=3.9.1 pkgver=4.0.0
_llvmver=3.9 _llvmver=${pkgver%%.*}
pkgrel=1 pkgrel=0
pkgdesc="LLVM version of libunwind library" pkgdesc="LLVM version of libunwind library"
url="http://llvm.org/" url="http://llvm.org/"
arch="all !ppc64le !s390x" arch="all !ppc64le !s390x"
@ -12,37 +12,31 @@ license="BSD"
depends_dev="!libunwind-dev" depends_dev="!libunwind-dev"
makedepends="cmake llvm$_llvmver-dev" makedepends="cmake llvm$_llvmver-dev"
subpackages="$pkgname-dev" subpackages="$pkgname-dev"
source="http://www.llvm.org/releases/$pkgver/$_pkgname-$pkgver.src.tar.xz" source="http://www.llvm.org/releases/$pkgver/$_pkgname-$pkgver.src.tar.xz
no-exec-stack.patch"
builddir="$srcdir/$_pkgname-$pkgver.src" builddir="$srcdir/$_pkgname-$pkgver.src"
options="!check" options="!check"
build() { build() {
local flag; for flag in 0 1; do cd "$builddir"
mkdir -p "$builddir"/build-$flag
cd "$builddir"/build-$flag
cmake .. \ cmake \
-DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DLLVM_CONFIG_PATH="/usr/lib/llvm$_llvmver/bin/llvm-config" \
-DLIBUNWIND_ENABLE_SHARED=$flag \ -DLIBUNWIND_HAS_NODEFAULTLIBS_FLAG=OFF
-DLIBUNWIND_HAS_NODEFAULTLIBS_FLAG=0 \ make
-DLLVM_CONFIG="/usr/bin/llvm-config-$_llvmver"
make
done
} }
package() { package() {
local flag; for flag in 0 1; do
make install -C "$builddir"/build-$flag DESTDIR="$pkgdir"
done
cd "$builddir" cd "$builddir"
make install DESTDIR="$pkgdir"
mkdir -p "$pkgdir"/usr/include mkdir -p "$pkgdir"/usr/include
cp include/*.h "$pkgdir"/usr/include/ cp include/*.h "$pkgdir"/usr/include/
} }
sha512sums="a80f5d0660e209f5bf709316b5df2ca63b9f0db49f5f74dfe9c9e580c654f61a15acc071a739fdb84baf5ffa9420b92498f8560331173642d80f6b74e1e2afb7 libunwind-3.9.1.src.tar.xz" sha512sums="c3c934b70830ef5496c9d24c469b702eb4408abd4fe4dd9e0832230b064dc78d23b02ed2a5ce9a099dea76c3d43cbf41d59c6cda189f990d5593c7d3cd5c79dd libunwind-4.0.0.src.tar.xz
2a61580331a9c8e5f9d4a12a845be187db65434257bb635eb509db43355709de0f17ddd8a589e0c8ee89ed29c0dc1cefd0fd9d11e4a0eb875b14ad4833063d11 no-exec-stack.patch"

19
community/llvm-libunwind/no-exec-stack.patch Normal file
View File

@ -0,0 +1,19 @@
Remove the gatekeeping to set a non-executable stack for libunwind,
as we don't define any of these directives but still want it.
diff -Nru a/src/assembly.h b/src/assembly.h
--- a/src/assembly.h 2016-10-23 21:48:47.000000000 +0000
+++ b/src/assembly.h 2017-05-16 12:38:47.209169931 +0000
@@ -47,12 +47,7 @@
#define SYMBOL_IS_FUNC(name) .type name,@function
#endif
-#if defined(__GNU__) || defined(__ANDROID__) || defined(__FreeBSD__) || \
- defined(__Fuchsia__)
#define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits
-#else
-#define NO_EXEC_STACK_DIRECTIVE
-#endif
#else