From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1119804-garchives=archives.gentoo.org@lists.gentoo.org>
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 831D3138335
for <garchives@archives.gentoo.org>; Fri, 1 Nov 2019 13:16:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6F4A9E0922;
Fri, 1 Nov 2019 13:16:08 +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 44555E091F
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Nov 2019 13:16:08 +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 1CEED34C64D
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Nov 2019 13:16:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F58C8A5
for <gentoo-commits@lists.gentoo.org>; Fri, 1 Nov 2019 13:16:03 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1572614147.1fce7cb316fb77e4361a551643af506cedd2536f.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/clang/clang-10.0.0.9999.ebuild sys-devel/clang/clang-9.0.1.9999.ebuild
X-VCS-Directories: sys-devel/clang/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 1fce7cb316fb77e4361a551643af506cedd2536f
X-VCS-Branch: master
Date: Fri, 1 Nov 2019 13:16:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a6151a22-d9dd-4442-aaef-55ed05b4621d
X-Archives-Hash: 97da285b6e67007f8d40086e56111733
commit: 1fce7cb316fb77e4361a551643af506cedd2536f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 08:34:42 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 13:15:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fce7cb3
sys-devel/clang: Switch live to monorepo
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-devel/clang/clang-10.0.0.9999.ebuild | 36 ++++++++++--------------------
sys-devel/clang/clang-9.0.1.9999.ebuild | 38 +++++++++++---------------------
2 files changed, 25 insertions(+), 49 deletions(-)
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild
index aa2c3a2ba5d..7213d45d161 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild
@@ -14,11 +14,9 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \
DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="https://llvm.org/"
SRC_URI=""
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${P}
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
- https://github.com/llvm-mirror/clang.git"
+S=${WORKDIR}/x/${P}/clang
# Keep in sync with sys-devel/llvm
ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
@@ -82,26 +80,16 @@ pkg_setup() {
src_unpack() {
# create extra parent dir for CLANG_RESOURCE_DIR
- mkdir -p x/y || die
- cd x/y || die
-
- git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
- https://github.com/llvm-mirror/clang-tools-extra.git"
- if use test; then
- # needed for patched gtest
- git-r3_fetch "https://git.llvm.org/git/llvm.git
- https://github.com/llvm-mirror/llvm.git"
- fi
- git-r3_fetch
+ mkdir -p x || die
- git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
- "${S}"/tools/extra
- if use test; then
- git-r3_checkout https://llvm.org/git/llvm.git \
- "${WORKDIR}"/llvm '' \
- lib/Testing/Support utils/{lit,llvm-lit,unittest}
- fi
- git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+ local dirs=( clang clang-tools-extra )
+ use test && dirs+=(
+ llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest}
+ )
+ git-r3_fetch
+ git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/x/${P}" '' "${dirs[@]}"
+ mv "${WORKDIR}/x/${P}/clang-tools-extra" \
+ "${WORKDIR}/x/${P}/clang/tools/extra" || die
}
check_distribution_components() {
@@ -258,7 +246,7 @@ multilib_src_configure() {
-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
)
use test && mycmakeargs+=(
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/${P}/llvm"
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
)
diff --git a/sys-devel/clang/clang-9.0.1.9999.ebuild b/sys-devel/clang/clang-9.0.1.9999.ebuild
index 848de712e24..788ba009941 100644
--- a/sys-devel/clang/clang-9.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-9.0.1.9999.ebuild
@@ -14,12 +14,10 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \
DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="https://llvm.org/"
SRC_URI=""
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
+EGIT_BRANCH="release/9.x"
# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${P}
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
- https://github.com/llvm-mirror/clang.git"
-EGIT_BRANCH="release_90"
+S=${WORKDIR}/x/${P}/clang
# Keep in sync with sys-devel/llvm
ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -90,26 +88,16 @@ pkg_setup() {
src_unpack() {
# create extra parent dir for CLANG_RESOURCE_DIR
- mkdir -p x/y || die
- cd x/y || die
-
- git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
- https://github.com/llvm-mirror/clang-tools-extra.git"
- if use test; then
- # needed for patched gtest
- git-r3_fetch "https://git.llvm.org/git/llvm.git
- https://github.com/llvm-mirror/llvm.git"
- fi
- git-r3_fetch
+ mkdir -p x || die
- git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
- "${S}"/tools/extra
- if use test; then
- git-r3_checkout https://llvm.org/git/llvm.git \
- "${WORKDIR}"/llvm '' \
- lib/Testing/Support utils/{lit,llvm-lit,unittest}
- fi
- git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+ local dirs=( clang clang-tools-extra )
+ use test && dirs+=(
+ llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest}
+ )
+ git-r3_fetch
+ git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/x/${P}" '' "${dirs[@]}"
+ mv "${WORKDIR}/x/${P}/clang-tools-extra" \
+ "${WORKDIR}/x/${P}/clang/tools/extra" || die
}
multilib_src_configure() {
@@ -143,7 +131,7 @@ multilib_src_configure() {
-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
)
use test && mycmakeargs+=(
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/${P}/llvm"
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
)