wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libcxx: update to 11.0.0

Browse source 
ssp_nonshared fix by q66
This commit is contained in:
Robin Voetter 2020-11-09 01:17:50 +01:00 • committed by q66
parent a245605ab7
commit c2287937df
2 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/libcxx/patches/ssp_nonshared.patch Normal file
View file

@ -0,0 +1,11 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -769,6 +769,8 @@ function(cxx_link_system_libraries target)
target_link_libraries(${target} PRIVATE atomic)
endif()
+#ssp target_link_libraries(${target} PRIVATE ssp_nonshared)
+
if (MINGW)
target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}")
endif()

31
srcpkgs/libcxx/template
View file

@ -1,21 +1,27 @@
# Template file for 'libcxx' # Template file for 'libcxx'
pkgname=libcxx pkgname=libcxx
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+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON
-DLIBCXX_CXX_ABI_LIBRARY_PATH=${XBPS_CROSS_BASE}/usr/lib -DLIBCXX_CXX_ABI_LIBRARY_PATH=${XBPS_CROSS_BASE}/usr/lib
-DLIBCXXABI_USE_LLVM_UNWINDER=1" -DLIBCXXABI_USE_LLVM_UNWINDER=1"
hostmakedepends="llvm10 clang-tools-extra python3" hostmakedepends="llvm11 clang-tools-extra python3"
makedepends="libcxxabi-devel llvm10 llvm-libunwind-devel" makedepends="libcxxabi-devel llvm11 llvm-libunwind-devel"
make_build_args="VERBOSE=1" make_build_args="VERBOSE=1"
short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above" short_desc="New implementation of the C++ standard library, targeting C++11, C++14 and above"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="NCSA, MIT" license="NCSA, MIT"
homepage="https://libcxx.llvm.org" homepage="https://libcxx.llvm.org"
distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libcxx-${version}.src.tar.xz" distfiles="
checksum=270f8a3f176f1981b0f6ab8aa556720988872ec2b48ed3b605d0ced8d09156c7 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}/libcxxabi-${version}.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz"
checksum="
6c1ee6690122f2711a77bc19241834a9219dda5036e1597bfa397f341a9b8b7a
58697d4427b7a854ec7529337477eb4fba16407222390ad81a40d125673e4c15
913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES" *-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES"
@ -23,9 +29,20 @@ esac
post_extract() { post_extract() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) patch -Np1 <${FILESDIR}/libcxx-0001-musl-hacks.patch *-musl) patch -Np1 <${FILESDIR}/libcxx-0001-musl-hacks.patch ;;
sed -i 's/!defined(_GCC_MAX_ALIGN_T)/& \&\& !defined(__DEFINED_max_align_t)/' include/stddef.h ;;
esac esac
# Since llvm 11, libcxxabi and llvm need to be present next to the libcxx root
mv ../libcxxabi-${version}.src ../libcxxabi
mv ../llvm-${version}.src ../llvm
}
post_patch() {
case "$XBPS_TARGET_MACHINE" in
i686-musl|ppc-musl) ;;
*) return 0 ;;
esac
vsed -i 's,#ssp,,' CMakeLists.txt
} }
post_install() { post_install() {