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 4D61A1382C5 for ; Tue, 23 Jun 2020 18:31:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9674AE0920; Tue, 23 Jun 2020 18:31:06 +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 744C4E0920 for ; Tue, 23 Jun 2020 18:31:06 +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 4EDA834F253 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 397C82BF 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: <1592937048.55cfb32030b360487d4473098d3bbba974dd713e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/lldb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/lldb/lldb-10.0.1.9999.ebuild dev-util/lldb/lldb-10.0.1_rc1.ebuild dev-util/lldb/lldb-11.0.0.9999.ebuild X-VCS-Directories: dev-util/lldb/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 55cfb32030b360487d4473098d3bbba974dd713e 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: a898d3fb-7f83-4e8a-9eb2-cb83550796f7 X-Archives-Hash: 3c6a00b8bf30cb8f8dec9f3b945c56d0 commit: 55cfb32030b360487d4473098d3bbba974dd713e Author: Michał Górny gentoo org> AuthorDate: Sat Jun 20 21:08:37 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jun 23 18:30:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55cfb320 dev-util/lldb: Dedupe with new eclass code Signed-off-by: Michał Górny gentoo.org> dev-util/lldb/lldb-10.0.1.9999.ebuild | 15 ++------------- dev-util/lldb/lldb-10.0.1_rc1.ebuild | 15 ++------------- dev-util/lldb/lldb-11.0.0.9999.ebuild | 15 ++------------- 3 files changed, 6 insertions(+), 39 deletions(-) diff --git a/dev-util/lldb/lldb-10.0.1.9999.ebuild b/dev-util/lldb/lldb-10.0.1.9999.ebuild index ecdb75359b1..2dfe01834ca 100644 --- a/dev-util/lldb/lldb-10.0.1.9999.ebuild +++ b/dev-util/lldb/lldb-10.0.1.9999.ebuild @@ -4,8 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multiprocessing python-single-r1 \ - toolchain-funcs +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" @@ -43,21 +42,11 @@ BDEPEND=" sys-devel/lld ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - pkg_setup() { LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup python-single-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DLLDB_ENABLE_CURSES=$(usex ncurses) @@ -87,7 +76,7 @@ src_configure() { -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) cmake_src_configure diff --git a/dev-util/lldb/lldb-10.0.1_rc1.ebuild b/dev-util/lldb/lldb-10.0.1_rc1.ebuild index ecdb75359b1..2dfe01834ca 100644 --- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild +++ b/dev-util/lldb/lldb-10.0.1_rc1.ebuild @@ -4,8 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multiprocessing python-single-r1 \ - toolchain-funcs +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" @@ -43,21 +42,11 @@ BDEPEND=" sys-devel/lld ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - pkg_setup() { LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup python-single-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DLLDB_ENABLE_CURSES=$(usex ncurses) @@ -87,7 +76,7 @@ src_configure() { -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) cmake_src_configure diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild index ecdb75359b1..2dfe01834ca 100644 --- a/dev-util/lldb/lldb-11.0.0.9999.ebuild +++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild @@ -4,8 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multiprocessing python-single-r1 \ - toolchain-funcs +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" @@ -43,21 +42,11 @@ BDEPEND=" sys-devel/lld ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - pkg_setup() { LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup python-single-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DLLDB_ENABLE_CURSES=$(usex ncurses) @@ -87,7 +76,7 @@ src_configure() { -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) cmake_src_configure