libcxxabi: update to 11.0.0

ssp_nonshared fix by q66
This commit is contained in:
Robin Voetter 2020-11-09 01:17:26 +01:00 committed by q66
parent ad1aaa3f84
commit a245605ab7
1 changed files with 15 additions and 10 deletions

View File

@ -1,23 +1,23 @@
# Template file for 'libcxxabi' # Template file for 'libcxxabi'
pkgname=libcxxabi pkgname=libcxxabi
version=10.0.0 version=11.0.0
revision=1 revision=1
wrksrc="${pkgname}-${version}.src" wrksrc="${pkgname}-${version}.src"
build_style=cmake build_style=cmake
configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../libcxx/include configure_args="-DLIBCXXABI_LIBCXX_INCLUDES=../../libcxx/include
-DLIBCXXABI_USE_LLVM_UNWINDER=1 -DLIBCXXABI_USE_LLVM_UNWINDER=1
-DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
make_build_args="VERBOSE=1" make_build_args="VERBOSE=1"
hostmakedepends="clang-tools-extra llvm10" hostmakedepends="clang-tools-extra llvm11"
makedepends="llvm10 llvm-libunwind-devel" makedepends="llvm11 llvm-libunwind-devel"
short_desc="Low-level support for libc++ standard library" short_desc="Low-level support for libc++ standard library"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="NCSA, MIT" license="NCSA, MIT"
homepage="https://libcxxabi.llvm.org" homepage="https://libcxxabi.llvm.org"
distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libcxxabi-${version}.src.tar.xz distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libcxxabi-${version}.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libcxx-${version}.src.tar.xz" https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libcxx-${version}.src.tar.xz"
checksum="e71bac75a88c9dde455ad3f2a2b449bf745eafd41d2d8432253b2964e0ca14e1 checksum="58697d4427b7a854ec7529337477eb4fba16407222390ad81a40d125673e4c15
270f8a3f176f1981b0f6ab8aa556720988872ec2b48ed3b605d0ced8d09156c7" 6c1ee6690122f2711a77bc19241834a9219dda5036e1597bfa397f341a9b8b7a"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
armv[67]l) armv[67]l)
@ -26,11 +26,16 @@ case "$XBPS_TARGET_MACHINE" in
esac esac
post_extract() { post_extract() {
# Break dependency cycle, we just need the headers here # Since llvm 11, libcxx needs to be present next to the libcxxabi root
mv ../libcxx-${version}.src libcxx mv ../libcxx-${version}.src ../libcxx
}
# For musl post_patch() {
sed -i 's/!defined(_GCC_MAX_ALIGN_T)/& \&\& !defined(__DEFINED_max_align_t)/' libcxx/include/stddef.h case "$XBPS_TARGET_MACHINE" in
i686-musl|ppc-musl) ;;
*) return 0 ;;
esac
vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' src/CMakeLists.txt
} }
post_install() { post_install() {