Created
October 4, 2018 19:20
-
-
Save Cogitri/756eb51c090b575441c681de08f5e72e to your computer and use it in GitHub Desktop.
0001-libcxxabi-update-to-7.0.0.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From d17c342f639fa5f74d77e5692426030422608de7 Mon Sep 17 00:00:00 2001 | |
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com> | |
Date: Tue, 2 Oct 2018 14:57:51 +0200 | |
Subject: [PATCH 1/2] libcxxabi: update to 7.0.0. | |
[ci skip] | |
--- | |
srcpkgs/libcxxabi/template | 31 ++++++++++++++++++++----------- | |
1 file changed, 20 insertions(+), 11 deletions(-) | |
diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template | |
index 554491a4d2..a136756b44 100644 | |
--- a/srcpkgs/libcxxabi/template | |
+++ b/srcpkgs/libcxxabi/template | |
@@ -1,33 +1,42 @@ | |
# Template file for 'libcxxabi' | |
pkgname=libcxxabi | |
-version=6.0.1 | |
+version=7.0.0 | |
revision=1 | |
wrksrc="${pkgname}-${version}.src" | |
build_style=cmake | |
-configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../libcxx/include" | |
+configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../libcxx/include | |
+ -DLIBCXXABI_USE_LLVM_UNWINDER=1" | |
make_build_args="VERBOSE=1" | |
hostmakedepends="llvm" | |
makedepends="llvm llvm-libunwind-devel" | |
-LDFLAGS="-Wl,--no-as-needed -lunwind -Wl,--as-needed" | |
short_desc="Low-level support for libc++ standard library" | |
maintainer="Juan RP <xtraeme@voidlinux.eu>" | |
-homepage="http://libcxxabi.llvm.org" | |
+homepage="https://libcxxabi.llvm.org" | |
license="NCSA, MIT" | |
-distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz | |
- http://www.llvm.org/releases/${version}/libcxx-${version}.src.tar.xz" | |
-checksum="209f2ec244a8945c891f722e9eda7c54a5a7048401abd62c62199f3064db385f | |
- 7654fbc810a03860e6f01a54c2297a0b9efb04c0b9aa0409251d9bdb3726fc67" | |
+distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz | |
+ https://www.llvm.org/releases/${version}/libcxx-${version}.src.tar.xz" | |
+checksum="9b45c759ff397512eae4d938ff82827b1bd7ccba49920777e5b5e460baeb245f | |
+ 9b342625ba2f4e65b52764ab2061e116c0337db2179c6bce7f9a0d70c52134f0" | |
+# Aarch64 fails to build with gcc | |
case "$XBPS_TARGET_MACHINE" in | |
- arm*) broken="Wierd EHABI defines break it";; | |
+ aarch64*) | |
+ hostmakedepends+=" clang" | |
+ pre_configure() { | |
+ pre_configure() { | |
+ export CC="clang" | |
+ export CXX="clang++" | |
+ | |
+ CFLAGS+=" --target=$XBPS_CROSS_TRIPLET --sysroot=${XBPS_CROSS_BASE}" | |
+ CXXFLAGS+=" --target=${XBPS_CROSS_TRIPLET} --sysroot=${XBPS_CROSS_BASE}" | |
+ } | |
+ ;; | |
esac | |
post_extract() { | |
# Break dependency cycle, we just need the headers here | |
mv ../libcxx-${version}.src libcxx | |
- sed -i 's,share/llvm/cmake,lib/cmake/llvm,g' CMakeLists.txt | |
- | |
# For musl | |
sed -i 's/!defined(_GCC_MAX_ALIGN_T)/& \&\& !defined(__DEFINED_max_align_t)/' libcxx/include/stddef.h | |
} | |
-- | |
2.19.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment