From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5AFF6138334 for ; Sun, 3 Nov 2019 11:46:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E994FE0921; Sun, 3 Nov 2019 11:46:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDD0CE0921 for ; Sun, 3 Nov 2019 11:46:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5346034C792 for ; Sun, 3 Nov 2019 11:46:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C42238AE for ; Sun, 3 Nov 2019 11:46:28 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1572781581.b7712b100afd17c4ad829c65ddf700a06bd7c9f6.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/llvm-libunwind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild X-VCS-Directories: sys-libs/llvm-libunwind/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b7712b100afd17c4ad829c65ddf700a06bd7c9f6 X-VCS-Branch: master Date: Sun, 3 Nov 2019 11:46:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 85c73ba3-91d8-48cb-82b6-b6870bfa0c29 X-Archives-Hash: 4f29703e15c68afc4111388513b80cec commit: b7712b100afd17c4ad829c65ddf700a06bd7c9f6 Author: Michał Górny gentoo org> AuthorDate: Fri Nov 1 18:00:05 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 3 11:46:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7712b10 sys-libs/llvm-libunwind: Port to llvm.org eclass Signed-off-by: Michał Górny gentoo.org> .../llvm-libunwind-10.0.0.9999.ebuild | 25 ++++++++------------- .../llvm-libunwind/llvm-libunwind-9.0.0.ebuild | 25 +++++---------------- .../llvm-libunwind-9.0.1.9999.ebuild | 26 ++++++++-------------- 3 files changed, 23 insertions(+), 53 deletions(-) diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild index 2edd3ca69fd..29ee7839931 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild @@ -4,13 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 +inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -S=${WORKDIR}/${P}/libunwind +LLVM_COMPONENTS=( libunwind ) +LLVM_TEST_COMPONENTS=( libcxx{,abi} ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -29,13 +29,6 @@ BDEPEND=" # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo -src_unpack() { - local dirs=( libunwind ) - use test && dirs+=( libcxx{,abi} ) - git-r3_fetch - git-r3_checkout '' '' '' "${dirs[@]}" -} - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -66,7 +59,7 @@ multilib_src_configure() { mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/${P}/libcxx" + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi @@ -75,7 +68,7 @@ multilib_src_configure() { build_libcxxabi() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxxabi + local CMAKE_USE_DIR=${WORKDIR}/libcxxabi local BUILD_DIR=${BUILD_DIR}/libcxxabi local mycmakeargs=( -DLIBCXXABI_LIBDIR_SUFFIX= @@ -84,7 +77,7 @@ build_libcxxabi() { -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_INCLUDE_TESTS=OFF - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include ) @@ -94,7 +87,7 @@ build_libcxxabi() { build_libcxx() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx + local CMAKE_USE_DIR=${WORKDIR}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( -DLIBCXX_LIBDIR_SUFFIX= @@ -103,7 +96,7 @@ build_libcxx() { -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}/${P}"/libcxxabi/include + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild index 3cdeb8d20c2..373f7d8c03a 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.0.ebuild @@ -4,19 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-multilib llvm multiprocessing python-any-r1 - -MY_P=libunwind-${PV/_/}.src -LIBCXX_P=libcxx-${PV/_/}.src -LIBCXXABI_P=libcxxabi-${PV/_/}.src +inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz - test? ( - https://releases.llvm.org/${PV}/${LIBCXX_P}.tar.xz - https://releases.llvm.org/${PV}/${LIBCXXABI_P}.tar.xz )" -S=${WORKDIR}/${MY_P} +LLVM_COMPONENTS=( libunwind ) +LLVM_TEST_COMPONENTS=( libcxx{,abi} ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -43,15 +37,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - default - - if use test; then - mv "${LIBCXX_P}" libcxx || die - mv "${LIBCXXABI_P}" libcxxabi || die - fi -} - multilib_src_configure() { local libdir=$(get_libdir) @@ -74,7 +59,7 @@ multilib_src_configure() { mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild index 91a1c433459..29ee7839931 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild @@ -4,14 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 +inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -EGIT_BRANCH="release/9.x" -S=${WORKDIR}/${P}/libunwind +LLVM_COMPONENTS=( libunwind ) +LLVM_TEST_COMPONENTS=( libcxx{,abi} ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -30,13 +29,6 @@ BDEPEND=" # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo -src_unpack() { - local dirs=( libunwind ) - use test && dirs+=( libcxx{,abi} ) - git-r3_fetch - git-r3_checkout '' '' '' "${dirs[@]}" -} - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -67,7 +59,7 @@ multilib_src_configure() { mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/${P}/libcxx" + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi @@ -76,7 +68,7 @@ multilib_src_configure() { build_libcxxabi() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxxabi + local CMAKE_USE_DIR=${WORKDIR}/libcxxabi local BUILD_DIR=${BUILD_DIR}/libcxxabi local mycmakeargs=( -DLIBCXXABI_LIBDIR_SUFFIX= @@ -85,7 +77,7 @@ build_libcxxabi() { -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_INCLUDE_TESTS=OFF - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include ) @@ -95,7 +87,7 @@ build_libcxxabi() { build_libcxx() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx + local CMAKE_USE_DIR=${WORKDIR}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( -DLIBCXX_LIBDIR_SUFFIX= @@ -104,7 +96,7 @@ build_libcxx() { -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}/${P}"/libcxxabi/include + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF