From 5c2fa80beb1d6b7d38e4d8e3aaf65fe68aa6b2c5 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 3 Jul 2018 20:20:06 -0300 Subject: [PATCH] libcxx: update to 6.0.1. [ci skip] --- srcpkgs/libcxx/template | 43 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template index 404b5d8ebd6..90ab202dc8d 100644 --- a/srcpkgs/libcxx/template +++ b/srcpkgs/libcxx/template @@ -1,42 +1,41 @@ # Template file for 'libcxx' pkgname=libcxx -version=6.0.0 +version=6.0.1 revision=1 +wrksrc="${pkgname}-${version}.src" build_style=cmake hostmakedepends="clang llvm python" makedepends="libcxxabi-devel llvm llvm-libunwind-devel" -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 -case "$XBPS_TARGET_MACHINE" in - *-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES" -esac make_build_args="VERBOSE=1" short_desc="New implementation of the C++ standard library, targeting C++11" maintainer="Juan RP " homepage="http://libcxx.llvm.org" license="NCSA, MIT" distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz" -checksum=70931a87bde9d358af6cb7869e7535ec6b015f7e6df64def6d2ecdd954040dd9 -wrksrc=${pkgname}-${version}.src +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 + +case "$XBPS_TARGET_MACHINE" in + *-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES" +esac post_extract() { case "$XBPS_TARGET_MACHINE" in - *-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 + *-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 } + pre_configure() { export CC="clang" export CXX="clang++"