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 122241382C5 for ; Tue, 23 Jun 2020 18:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C2FDE0929; Tue, 23 Jun 2020 18:31:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DB80BE0929 for ; Tue, 23 Jun 2020 18:31:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9BFD434F26B for ; Tue, 23 Jun 2020 18:31:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7296A2C3 for ; Tue, 23 Jun 2020 18:30:59 +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: <1592937051.cc57fc296b8db42887f2a99293e66668ea230876.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.1.9999.ebuild sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild X-VCS-Directories: sys-libs/llvm-libunwind/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: cc57fc296b8db42887f2a99293e66668ea230876 X-VCS-Branch: master Date: Tue, 23 Jun 2020 18:30:59 +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: 950a1bbe-1aea-49b8-98cd-19895224fe2a X-Archives-Hash: 903e25d3c0bd0655bac2621fbbc5fb7f commit: cc57fc296b8db42887f2a99293e66668ea230876 Author: Michał Górny gentoo org> AuthorDate: Sat Jun 20 21:08:40 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jun 23 18:30:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc57fc29 sys-libs/llvm-libunwind: Dedupe with new eclass code Signed-off-by: Michał Górny gentoo.org> .../llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild | 16 ++-------------- sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild | 16 ++-------------- .../llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild | 16 ++-------------- 3 files changed, 6 insertions(+), 42 deletions(-) diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild index 6d15a7f4a17..711bac7d068 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 +inherit cmake-multilib llvm llvm.org python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" @@ -27,9 +27,6 @@ BDEPEND=" test? ( >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -38,13 +35,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - multilib_src_configure() { local libdir=$(get_libdir) @@ -60,13 +50,11 @@ multilib_src_configure() { ) 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}" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild index 6d15a7f4a17..711bac7d068 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1_rc1.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 +inherit cmake-multilib llvm llvm.org python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" @@ -27,9 +27,6 @@ BDEPEND=" test? ( >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -38,13 +35,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - multilib_src_configure() { local libdir=$(get_libdir) @@ -60,13 +50,11 @@ multilib_src_configure() { ) 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}" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild index 6d15a7f4a17..711bac7d068 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 +inherit cmake-multilib llvm llvm.org python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" @@ -27,9 +27,6 @@ BDEPEND=" test? ( >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -38,13 +35,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - multilib_src_configure() { local libdir=$(get_libdir) @@ -60,13 +50,11 @@ multilib_src_configure() { ) 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}" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" ) fi