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 79448138334 for ; Sun, 3 Nov 2019 11:46:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 757D4E0918; Sun, 3 Nov 2019 11:46:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 215A4E090F 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 1A06834C790 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 881188AB 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: <1572781577.f52b631c9e9d0a8ef2a555ed46d32878deaac4f1.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.0.9999.ebuild dev-util/lldb/lldb-9.0.0.ebuild dev-util/lldb/lldb-9.0.1.9999.ebuild X-VCS-Directories: dev-util/lldb/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f52b631c9e9d0a8ef2a555ed46d32878deaac4f1 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: 06a28db1-63c7-4af5-8a76-5921fb0dc5e7 X-Archives-Hash: b1634fc2050ad8442a0c213b7d5776c5 commit: f52b631c9e9d0a8ef2a555ed46d32878deaac4f1 Author: Michał Górny gentoo org> AuthorDate: Fri Nov 1 17:44:57 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 3 11:46:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52b631c dev-util/lldb: Port to llvm.org eclass Signed-off-by: Michał Górny gentoo.org> dev-util/lldb/lldb-10.0.0.9999.ebuild | 17 +++++------------ dev-util/lldb/lldb-9.0.0.ebuild | 23 ++++------------------- dev-util/lldb/lldb-9.0.1.9999.ebuild | 18 +++++------------- 3 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild index 4534586ab24..38487892977 100644 --- a/dev-util/lldb/lldb-10.0.0.9999.ebuild +++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild @@ -4,14 +4,14 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ +inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \ toolchain-funcs DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -S=${WORKDIR}/${P}/lldb +LLVM_COMPONENTS=( lldb ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -45,13 +45,6 @@ pkg_setup() { python-single-r1_pkg_setup } -src_unpack() { - local dirs=( lldb ) - use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) - git-r3_fetch - git-r3_checkout '' '' '' "${dirs[@]}" -} - src_configure() { local mycmakeargs=( -DLLDB_DISABLE_CURSES=$(usex !ncurses) @@ -80,7 +73,7 @@ src_configure() { -DLLDB_TEST_C_COMPILER="$(type -P clang)" -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" + -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)")}" ) diff --git a/dev-util/lldb/lldb-9.0.0.ebuild b/dev-util/lldb/lldb-9.0.0.ebuild index 3c2667d0a03..bc79687eb31 100644 --- a/dev-util/lldb/lldb-9.0.0.ebuild +++ b/dev-util/lldb/lldb-9.0.0.ebuild @@ -4,17 +4,14 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6}} ) -inherit cmake-utils llvm multiprocessing python-single-r1 \ +inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \ toolchain-funcs -MY_P=${P/_/}.src -LLVM_P=llvm-${PV/_/}.src - DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz - test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )" -S=${WORKDIR}/${MY_P} +LLVM_COMPONENTS=( lldb ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -47,18 +44,6 @@ pkg_setup() { python-single-r1_pkg_setup } -src_unpack() { - einfo "Unpacking ${MY_P}.tar.xz ..." - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die - - if use test; then - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..." - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \ - "${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die - mv "${LLVM_P}" llvm || die - fi -} - src_configure() { local mycmakeargs=( -DLLDB_DISABLE_CURSES=$(usex !ncurses) diff --git a/dev-util/lldb/lldb-9.0.1.9999.ebuild b/dev-util/lldb/lldb-9.0.1.9999.ebuild index 7279dd54c01..2e9e420b07e 100644 --- a/dev-util/lldb/lldb-9.0.1.9999.ebuild +++ b/dev-util/lldb/lldb-9.0.1.9999.ebuild @@ -4,15 +4,14 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ +inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \ toolchain-funcs DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -EGIT_BRANCH="release/9.x" -S=${WORKDIR}/${P}/lldb +LLVM_COMPONENTS=( lldb ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -45,13 +44,6 @@ pkg_setup() { python-single-r1_pkg_setup } -src_unpack() { - local dirs=( lldb ) - use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) - git-r3_fetch - git-r3_checkout '' '' '' "${dirs[@]}" -} - src_configure() { local mycmakeargs=( -DLLDB_DISABLE_CURSES=$(usex !ncurses) @@ -78,7 +70,7 @@ src_configure() { -DLLDB_TEST_C_COMPILER="$(type -P clang)" -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" + -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)")}" )