Created
October 4, 2018 19:20
-
-
Save Cogitri/b6e08c6d911e437dc155f87d49932058 to your computer and use it in GitHub Desktop.
0002-libcxx-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 870fcfe6f67c27b9e01cb95e816310f1306e519a Mon Sep 17 00:00:00 2001 | |
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com> | |
Date: Tue, 2 Oct 2018 15:01:09 +0200 | |
Subject: [PATCH 2/2] libcxx: update to 7.0.0. | |
[ci skip] | |
--- | |
srcpkgs/libcxx/template | 38 +++++++++++--------------------------- | |
1 file changed, 11 insertions(+), 27 deletions(-) | |
diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template | |
index 90ab202dc8..1c27c114d5 100644 | |
--- a/srcpkgs/libcxx/template | |
+++ b/srcpkgs/libcxx/template | |
@@ -1,29 +1,21 @@ | |
# Template file for 'libcxx' | |
pkgname=libcxx | |
-version=6.0.1 | |
+version=7.0.0 | |
revision=1 | |
wrksrc="${pkgname}-${version}.src" | |
build_style=cmake | |
-hostmakedepends="clang llvm python" | |
+configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON | |
+ -DLIBCXX_CXX_ABI_LIBRARY_PATH=${XBPS_CROSS_BASE}/usr/lib | |
+ -DLIBCXXABI_USE_LLVM_UNWINDER=1" | |
+hostmakedepends="llvm python" | |
makedepends="libcxxabi-devel llvm llvm-libunwind-devel" | |
make_build_args="VERBOSE=1" | |
short_desc="New implementation of the C++ standard library, targeting C++11" | |
maintainer="Juan RP <xtraeme@voidlinux.eu>" | |
-homepage="http://libcxx.llvm.org" | |
+homepage="https://libcxx.llvm.org" | |
license="NCSA, MIT" | |
-distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz" | |
-checksum=7654fbc810a03860e6f01a54c2297a0b9efb04c0b9aa0409251d9bdb3726fc67 | |
- | |
-case "$XBPS_TARGET_MACHINE" in | |
- arm*) _broken="libcxxabi doesn't build on arm." ;; | |
- *) configure_args+=" | |
- -DLIBCXX_CXX_ABI=libcxxabi | |
- -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON | |
- -DLIBCXX_CXX_ABI_LIBRARY_PATH=${XBPS_CROSS_BASE}/usr/lib | |
- -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ | |
- " | |
- LDFLAGS="-Wl,--no-as-needed -lunwind -Wl,--as-needed" | |
-esac | |
+distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz" | |
+checksum=9b342625ba2f4e65b52764ab2061e116c0337db2179c6bce7f9a0d70c52134f0 | |
case "$XBPS_TARGET_MACHINE" in | |
*-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES" | |
@@ -36,18 +28,10 @@ post_extract() { | |
esac | |
} | |
-pre_configure() { | |
- export CC="clang" | |
- export CXX="clang++" | |
- if [ "$CROSS_BUILD" ]; then | |
- for _gccdir in /usr/lib/gcc/$XBPS_CROSS_TRIPLET/*.*.*; do | |
- CFLAGS+=" --target=$XBPS_CROSS_TRIPLET --sysroot=/usr/$XBPS_CROSS_TRIPLET -B$_gccdir" | |
- CXXFLAGS+=" --target=$XBPS_CROSS_TRIPLET --sysroot=/usr/$XBPS_CROSS_TRIPLET -B$_gccdir" | |
- LDFLAGS+=" -L$_gccdir" | |
- done | |
- fi | |
- | |
+post_install() { | |
+ vlicense LICENSE.TXT | |
} | |
+ | |
libcxx-devel_package() { | |
short_desc+=" - development files" | |
depends="${sourcepkg}>=${version}_${revision}" | |
-- | |
2.19.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment