commit:     5516e831962b807658a934f1747def57a1999c14
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 19:12:17 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 20:09:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5516e831

sys-libs/libcxx: Bump to 7.1.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libcxx/Manifest            |   1 +
 sys-libs/libcxx/libcxx-7.1.0.ebuild | 215 ++++++++++++++++++++++++++++++++++++
 2 files changed, 216 insertions(+)

diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index ea4e572a5b7..6349d71ca1e 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,3 +1,4 @@
 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 
65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8
 SHA512 
c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 DIST libcxx-7.0.1.src.tar.xz 1638188 BLAKE2B 
541d27c3801895d59ad06b15de5fe9ff0d9b5b3ef393a5fad05a12a52dd6453ecc530b0ce3129624a27e959d3c9c5f7066ebb57fd85caca538ebf4f990aa6967
 SHA512 
b3ad7ad95bdcf2d902b29de8a0b757d4dbc220bc1a22a813d6bcec15a34b3aa42e85c59f4cecbb318c799ca611550b44c328b37278f4349b984016ad4556c1d8
+DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B 
eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219
 SHA512 
925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5
 DIST libcxx-8.0.0.src.tar.xz 1752308 BLAKE2B 
1e8cd8c7100f5f8b943ba8f38b0b59a0fd5e5bea834953483a67502f67de3eb51eba4ed4be17cdb54406da4ad7ebc6fef33934c59db982afa55856ce9f1f46ff
 SHA512 
2e0fcd3e78f7e15ea894e52c51351daef8e3a2aaf53b3df7497b11403d28f5269ff49a4674bacea1d565a5faa2b24502caaaeff9cd48518f0d141563d8f9cc03

diff --git a/sys-libs/libcxx/libcxx-7.1.0.ebuild 
b/sys-libs/libcxx/libcxx-7.1.0.ebuild
new file mode 100644
index 00000000000..29aa632a979
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-7.1.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Ninja provides better scalability and cleaner verbose output, and is used
+# throughout all LLVM projects.
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib llvm multiprocessing python-any-r1 \
+       toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/";
+SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz";
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
+       ?? ( libcxxabi libcxxrt )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       libcxxabi? ( 
~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+       libcxxrt? ( 
sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+       !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+       test? ( >=sys-devel/clang-3.9.0
+               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
+       app-arch/xz-utils
+       >=sys-devel/llvm-6"
+
+S=${WORKDIR}/${P/_/}.src
+
+DOCS=( CREDITS.TXT )
+
+PATCHES=(
+       # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+       # out-of-tree build.
+       "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+)
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+       has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+       llvm_pkg_setup
+       use test && python-any-r1_pkg_setup
+
+       if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
+               eerror "To build ${PN} against libsupc++, you have to use gcc. 
Other"
+               eerror "compilers are not supported. Please set CC=gcc and 
CXX=g++"
+               eerror "and try again."
+               die
+       fi
+       if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
+               eerror "${PN} needs to be built with gcc-4.7 or later (or other"
+               eerror "conformant compilers). Please use gcc-config to switch 
to"
+               eerror "gcc-4.7 or later version."
+               die
+       fi
+}
+
+test_compiler() {
+       $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+               <<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+       # note: we need to do this before multilib kicks in since it will
+       # alter the CHOST
+       local cxxabi cxxabi_incs
+       if use libcxxabi; then
+               cxxabi=libcxxabi
+               cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+       elif use libcxxrt; then
+               cxxabi=libcxxrt
+               cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
+       else
+               local 
gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+               cxxabi=libsupc++
+               cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+       fi
+
+       multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+       # we want -lgcc_s for unwinder, and for compiler runtime when using
+       # gcc, clang with gcc runtime (or any unknown compiler)
+       local extra_libs=() want_gcc_s=ON
+       if use libunwind; then
+               # work-around missing -lunwind upstream
+               extra_libs+=( -lunwind )
+               # if we're using libunwind and clang with compiler-rt, we want
+               # to link to compiler-rt instead of -lgcc_s
+               if tc-is-clang; then
+                       local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+                          ${LDFLAGS} -print-libgcc-file-name)
+                       if [[ ${compiler_rt} == *libclang_rt* ]]; then
+                               want_gcc_s=OFF
+                               extra_libs+=( "${compiler_rt}" )
+                       fi
+               fi
+       fi
+
+       # bootstrap: cmake is unhappy if compiler can't link to stdlib
+       local nolib_flags=( -nodefaultlibs -lc )
+       if ! test_compiler; then
+               if test_compiler "${nolib_flags[@]}"; then
+                       local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+                       ewarn "${CXX} seems to lack runtime, trying with 
${nolib_flags[*]}"
+               fi
+       fi
+
+       local libdir=$(get_libdir)
+       local mycmakeargs=(
+               -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+               -DLIBCXX_ENABLE_SHARED=ON
+               -DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+               -DLIBCXX_CXX_ABI=${cxxabi}
+               -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+               # we're using our own mechanism for generating linker scripts
+               -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+               -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+               -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+               -DLIBCXX_INCLUDE_TESTS=$(usex test)
+               -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+       )
+
+       if use test; then
+               local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 
2>/dev/null)
+               local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" 
"$(get_nproc)")}
+
+               [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang 
for tests"
+
+               mycmakeargs+=(
+                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+                       
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+               )
+       fi
+       cmake-utils_src_configure
+}
+
+multilib_src_test() {
+       cmake-utils_src_make check-libcxx
+}
+
+# Usage: deps
+gen_ldscript() {
+       local output_format
+       output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | 
sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+       [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( 
${output_format} )"
+
+       cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+       local libdir=$(get_libdir)
+       local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt 
"libcxxrt.a" "libsupc++.a")")
+
+       # Move it first.
+       mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" 
|| die
+       # Generate libc++.a ldscript for inclusion of its dependencies so that
+       # clang++ -stdlib=libc++ -static works out of the box.
+       local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a 
libgcc_eh.a)"
+       # On Linux/glibc it does not link without libpthread or libdl. It is
+       # fine on FreeBSD.
+       use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+       gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+       local libdir=$(get_libdir)
+       # libsupc++ doesn't have a shared version
+       local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt 
"libcxxrt.so" "libsupc++.a")")
+
+       mv "${ED}/usr/${libdir}/libc++.so" 
"${ED}/usr/${libdir}/libc++_shared.so" || die
+       local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind 
libunwind.so libgcc_s.so)"
+
+       gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+       cmake-utils_src_install
+       gen_shared_ldscript
+       use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+       elog "This package (${PN}) is mainly intended as a replacement for the 
C++"
+       elog "standard library when using clang."
+       elog "To use it, instead of libstdc++, use:"
+       elog "    clang++ -stdlib=libc++"
+       elog "to compile your C++ programs."
+}

Reply via email to