| 1 |
commit: 917b6c0905b527aaf74e680c0cd1ca421ab30d95 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 21 08:32:54 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 21 09:15:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917b6c09 |
| 7 |
|
| 8 |
sys-devel/clang: Reorder ebuild vars in 9+ |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-devel/clang/clang-10.0.0.9999.ebuild | 11 +++++------ |
| 13 |
sys-devel/clang/clang-9.0.0.9999.ebuild | 11 +++++------ |
| 14 |
sys-devel/clang/clang-9.0.0.ebuild | 10 ++++------ |
| 15 |
3 files changed, 14 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild |
| 18 |
index 54f0479ac53..88157e2c886 100644 |
| 19 |
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild |
| 20 |
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild |
| 21 |
@@ -14,6 +14,9 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \ |
| 22 |
DESCRIPTION="C language family frontend for LLVM" |
| 23 |
HOMEPAGE="https://llvm.org/" |
| 24 |
SRC_URI="" |
| 25 |
+# We need extra level of indirection for CLANG_RESOURCE_DIR |
| 26 |
+S=${WORKDIR}/x/y/${P} |
| 27 |
+ |
| 28 |
EGIT_REPO_URI="https://git.llvm.org/git/clang.git |
| 29 |
https://github.com/llvm-mirror/clang.git" |
| 30 |
|
| 31 |
@@ -33,6 +36,8 @@ SLOT="$(ver_cut 1)" |
| 32 |
KEYWORDS="" |
| 33 |
IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer |
| 34 |
test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" |
| 35 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 36 |
+ || ( ${ALL_LLVM_TARGETS[*]} )" |
| 37 |
RESTRICT="!test? ( test )" |
| 38 |
|
| 39 |
RDEPEND=" |
| 40 |
@@ -56,12 +61,6 @@ PDEPEND=" |
| 41 |
default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) |
| 42 |
default-libcxx? ( >=sys-libs/libcxx-${PV} )" |
| 43 |
|
| 44 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 45 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
| 46 |
- |
| 47 |
-# We need extra level of indirection for CLANG_RESOURCE_DIR |
| 48 |
-S=${WORKDIR}/x/y/${P} |
| 49 |
- |
| 50 |
# least intrusive of all |
| 51 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
| 52 |
|
| 53 |
|
| 54 |
diff --git a/sys-devel/clang/clang-9.0.0.9999.ebuild b/sys-devel/clang/clang-9.0.0.9999.ebuild |
| 55 |
index 16f86d8d2b9..848de712e24 100644 |
| 56 |
--- a/sys-devel/clang/clang-9.0.0.9999.ebuild |
| 57 |
+++ b/sys-devel/clang/clang-9.0.0.9999.ebuild |
| 58 |
@@ -14,6 +14,9 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \ |
| 59 |
DESCRIPTION="C language family frontend for LLVM" |
| 60 |
HOMEPAGE="https://llvm.org/" |
| 61 |
SRC_URI="" |
| 62 |
+# We need extra level of indirection for CLANG_RESOURCE_DIR |
| 63 |
+S=${WORKDIR}/x/y/${P} |
| 64 |
+ |
| 65 |
EGIT_REPO_URI="https://git.llvm.org/git/clang.git |
| 66 |
https://github.com/llvm-mirror/clang.git" |
| 67 |
EGIT_BRANCH="release_90" |
| 68 |
@@ -32,6 +35,8 @@ SLOT="$(ver_cut 1)" |
| 69 |
KEYWORDS="" |
| 70 |
IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer |
| 71 |
test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" |
| 72 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 73 |
+ || ( ${ALL_LLVM_TARGETS[*]} )" |
| 74 |
RESTRICT="!test? ( test )" |
| 75 |
|
| 76 |
RDEPEND=" |
| 77 |
@@ -55,12 +60,6 @@ PDEPEND=" |
| 78 |
default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) |
| 79 |
default-libcxx? ( >=sys-libs/libcxx-${PV} )" |
| 80 |
|
| 81 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 82 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
| 83 |
- |
| 84 |
-# We need extra level of indirection for CLANG_RESOURCE_DIR |
| 85 |
-S=${WORKDIR}/x/y/${P} |
| 86 |
- |
| 87 |
# least intrusive of all |
| 88 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
| 89 |
|
| 90 |
|
| 91 |
diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild |
| 92 |
index e72ceac433b..4a4b325876a 100644 |
| 93 |
--- a/sys-devel/clang/clang-9.0.0.ebuild |
| 94 |
+++ b/sys-devel/clang/clang-9.0.0.ebuild |
| 95 |
@@ -21,6 +21,8 @@ SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz |
| 96 |
https://releases.llvm.org/${PV}/${EXTRA_P}.tar.xz |
| 97 |
test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz ) |
| 98 |
!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )" |
| 99 |
+# We need extra level of indirection for CLANG_RESOURCE_DIR |
| 100 |
+S=${WORKDIR}/x/y/${MY_P} |
| 101 |
|
| 102 |
# Keep in sync with sys-devel/llvm |
| 103 |
ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 |
| 104 |
@@ -36,6 +38,8 @@ SLOT="$(ver_cut 1)" |
| 105 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux" |
| 106 |
IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer |
| 107 |
test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" |
| 108 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 109 |
+ || ( ${ALL_LLVM_TARGETS[*]} )" |
| 110 |
RESTRICT="!test? ( test )" |
| 111 |
|
| 112 |
RDEPEND=" |
| 113 |
@@ -59,12 +63,6 @@ PDEPEND=" |
| 114 |
default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) |
| 115 |
default-libcxx? ( >=sys-libs/libcxx-${PV} )" |
| 116 |
|
| 117 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 118 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
| 119 |
- |
| 120 |
-# We need extra level of indirection for CLANG_RESOURCE_DIR |
| 121 |
-S=${WORKDIR}/x/y/${MY_P} |
| 122 |
- |
| 123 |
# least intrusive of all |
| 124 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
Archives