Re: [PR PATCH] [Updated] libcxx bump

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

There is an updated pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages cxxabi8
https://github.com/void-linux/void-packages/pull/14546

libcxx bump
Fixes #14512.

A patch file from https://github.com/void-linux/void-packages/pull/14546.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cxxabi8-14546.patch --]
[-- Type: text/x-diff, Size: 4301 bytes --]

From 4f35b6d8f3ee1ec4ea3d03b5f828f376b4656b93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Sep 2019 10:44:00 +0200
Subject: [PATCH 1/2] libcxxabi: update to 8.0.0.

---
 srcpkgs/libcxxabi/template | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libcxxabi/template b/srcpkgs/libcxxabi/template
index 258ce27f382..fe748223ef3 100644
--- a/srcpkgs/libcxxabi/template
+++ b/srcpkgs/libcxxabi/template
@@ -1,6 +1,6 @@
 # Template file for 'libcxxabi'
 pkgname=libcxxabi
-version=7.0.1
+version=8.0.0
 revision=1
 wrksrc="${pkgname}-${version}.src"
 build_style=cmake
@@ -8,33 +8,21 @@ configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../libcxx/include
  -DLIBCXXABI_USE_LLVM_UNWINDER=1
  -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
 make_build_args="VERBOSE=1"
-hostmakedepends="llvm7"
-makedepends="llvm7 llvm-libunwind-devel"
+hostmakedepends="llvm8"
+makedepends="llvm8 llvm-libunwind-devel"
 short_desc="Low-level support for libc++ standard library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA, MIT"
 homepage="https://libcxxabi.llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz
  https://www.llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"
-checksum="8168903a157ca7ab8423d3b974eaa497230b1564ceb57260be2bd14412e8ded8
- 020002618b319dc2a8ba1f2cba88b8cc6a209005ed8ad29f9de0c562c6ebb9f1"
+checksum="c2d6de9629f7c072ac20ada776374e9e3168142f20a46cdb9d6df973922b07cd
+ c2902675e7c84324fb2c1e45489220f250ede016cc3117186785d9dc291f9de2"
 
-# Aarch64 fails to build with gcc
 case "$XBPS_TARGET_MACHINE" in
 	armv[67]l)
 		broken="invalid operands of types 'char [8]' and 'const uint64_t' to binary 'operator&'"
 	;;
-	aarch64*)
-		hostmakedepends+=" clang"
-		configure_args+=" -DLIBCXXABI_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET}"
-		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} -I$(ls -d ${XBPS_CROSS_BASE}/usr/include/c++/*/${XBPS_CROSS_TRIPLET} | head -n1)"
-		}
-	;;
 esac
 
 post_extract() {

From be3a6d1abfc046df3c673e9fef37e880ca34d33a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 18 Sep 2019 10:44:02 +0200
Subject: [PATCH 2/2] libcxx: update to 8.0.0.

---
 srcpkgs/libcxx/template | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template
index 81de61b9f30..df7444a470f 100644
--- a/srcpkgs/libcxx/template
+++ b/srcpkgs/libcxx/template
@@ -1,41 +1,26 @@
 # Template file for 'libcxx'
 pkgname=libcxx
-version=7.0.1
+version=8.0.0
 revision=1
 wrksrc="${pkgname}-${version}.src"
 build_style=cmake
 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="llvm7 python"
+hostmakedepends="llvm8 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"
+short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://libcxx.llvm.org"
 license="NCSA, MIT"
+homepage="https://libcxx.llvm.org"
 distfiles="https://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz"
-checksum=020002618b319dc2a8ba1f2cba88b8cc6a209005ed8ad29f9de0c562c6ebb9f1
+checksum=c2902675e7c84324fb2c1e45489220f250ede016cc3117186785d9dc291f9de2
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES"
 esac
 
-# Doesn't build on AArch64 with GCC
-case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" clang"
-		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() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl) patch -Np1 <${FILESDIR}/libcxx-0001-musl-hacks.patch