| 1 |
commit: 0392383fc9f0c13a5854bf69a9b7f061c13d58f7 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 1 08:34:49 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 1 13:15:51 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0392383f |
| 7 |
|
| 8 |
sys-libs/compiler-rt-sanitizers: Switch live to monorepo |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../compiler-rt-sanitizers-10.0.0.9999.ebuild | 22 +++++++------------- |
| 13 |
.../compiler-rt-sanitizers-9.0.1.9999.ebuild | 24 ++++++++-------------- |
| 14 |
2 files changed, 15 insertions(+), 31 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild |
| 17 |
index a2a2f1e49bf..0ef9de1da9b 100644 |
| 18 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild |
| 19 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild |
| 20 |
@@ -14,8 +14,8 @@ inherit check-reqs cmake-utils flag-o-matic git-r3 llvm \ |
| 21 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 22 |
HOMEPAGE="https://llvm.org/" |
| 23 |
SRC_URI="" |
| 24 |
-EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git |
| 25 |
- https://github.com/llvm-mirror/compiler-rt.git" |
| 26 |
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 27 |
+S=${WORKDIR}/${P}/compiler-rt |
| 28 |
|
| 29 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 30 |
SLOT="$(ver_cut 1-3)" |
| 31 |
@@ -60,18 +60,10 @@ pkg_setup() { |
| 32 |
} |
| 33 |
|
| 34 |
src_unpack() { |
| 35 |
- if use test; then |
| 36 |
- # needed for patched gtest |
| 37 |
- git-r3_fetch "https://git.llvm.org/git/llvm.git |
| 38 |
- https://github.com/llvm-mirror/llvm.git" |
| 39 |
- fi |
| 40 |
+ local dirs=( compiler-rt ) |
| 41 |
+ use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) |
| 42 |
git-r3_fetch |
| 43 |
- |
| 44 |
- if use test; then |
| 45 |
- git-r3_checkout https://llvm.org/git/llvm.git \ |
| 46 |
- "${WORKDIR}"/llvm '' utils/unittest |
| 47 |
- fi |
| 48 |
- git-r3_checkout |
| 49 |
+ git-r3_checkout '' '' '' "${dirs[@]}" |
| 50 |
} |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
@@ -88,7 +80,7 @@ src_prepare() { |
| 54 |
|
| 55 |
src_configure() { |
| 56 |
# pre-set since we need to pass it to cmake |
| 57 |
- BUILD_DIR=${WORKDIR}/${P}_build |
| 58 |
+ BUILD_DIR=${WORKDIR}/${P}/compiler-rt_build |
| 59 |
|
| 60 |
if use clang; then |
| 61 |
local -x CC=${CHOST}-clang |
| 62 |
@@ -113,7 +105,7 @@ src_configure() { |
| 63 |
) |
| 64 |
if use test; then |
| 65 |
mycmakeargs+=( |
| 66 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 67 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
| 68 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 69 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 70 |
|
| 71 |
|
| 72 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild |
| 73 |
index f147105624d..ffb67b0bddf 100644 |
| 74 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild |
| 75 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild |
| 76 |
@@ -14,9 +14,9 @@ inherit check-reqs cmake-utils flag-o-matic git-r3 llvm \ |
| 77 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 78 |
HOMEPAGE="https://llvm.org/" |
| 79 |
SRC_URI="" |
| 80 |
-EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git |
| 81 |
- https://github.com/llvm-mirror/compiler-rt.git" |
| 82 |
-EGIT_BRANCH="release_90" |
| 83 |
+EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 84 |
+EGIT_BRANCH="release/9.x" |
| 85 |
+S=${WORKDIR}/${P}/compiler-rt |
| 86 |
|
| 87 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 88 |
SLOT="$(ver_cut 1-3)" |
| 89 |
@@ -61,18 +61,10 @@ pkg_setup() { |
| 90 |
} |
| 91 |
|
| 92 |
src_unpack() { |
| 93 |
- if use test; then |
| 94 |
- # needed for patched gtest |
| 95 |
- git-r3_fetch "https://git.llvm.org/git/llvm.git |
| 96 |
- https://github.com/llvm-mirror/llvm.git" |
| 97 |
- fi |
| 98 |
+ local dirs=( compiler-rt ) |
| 99 |
+ use test && dirs+=( llvm/utils/unittest ) |
| 100 |
git-r3_fetch |
| 101 |
- |
| 102 |
- if use test; then |
| 103 |
- git-r3_checkout https://llvm.org/git/llvm.git \ |
| 104 |
- "${WORKDIR}"/llvm '' utils/unittest |
| 105 |
- fi |
| 106 |
- git-r3_checkout |
| 107 |
+ git-r3_checkout '' '' '' "${dirs[@]}" |
| 108 |
} |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
@@ -89,7 +81,7 @@ src_prepare() { |
| 112 |
|
| 113 |
src_configure() { |
| 114 |
# pre-set since we need to pass it to cmake |
| 115 |
- BUILD_DIR=${WORKDIR}/${P}_build |
| 116 |
+ BUILD_DIR=${WORKDIR}/${P}/compiler-rt_build |
| 117 |
|
| 118 |
if use clang; then |
| 119 |
local -x CC=${CHOST}-clang |
| 120 |
@@ -114,7 +106,7 @@ src_configure() { |
| 121 |
) |
| 122 |
if use test; then |
| 123 |
mycmakeargs+=( |
| 124 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 125 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
| 126 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 127 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
Archives