| 1 |
commit: 618a0bfbf207f9ee176dcdfd16b88737a2da3c08 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 17 21:00:17 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 17 21:00:51 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618a0bfb |
| 7 |
|
| 8 |
sys-devel/llvm: Use BDEPEND semi-properly |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-devel/llvm/llvm-10.0.0.9999.ebuild | 9 +++++---- |
| 13 |
sys-devel/llvm/llvm-9.0.0.9999.ebuild | 9 +++++---- |
| 14 |
2 files changed, 10 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild |
| 17 |
index bacec8033f4..131e44a7f88 100644 |
| 18 |
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild |
| 19 |
+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild |
| 20 |
@@ -55,6 +55,9 @@ RDEPEND=" |
| 21 |
z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )" |
| 22 |
# configparser-3.2 breaks the build (3.3 or none at all are fine) |
| 23 |
DEPEND="${RDEPEND} |
| 24 |
+ gold? ( sys-libs/binutils-libs )" |
| 25 |
+BDEPEND=" |
| 26 |
+ dev-lang/perl |
| 27 |
|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 |
| 28 |
( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) |
| 29 |
) |
| 30 |
@@ -66,7 +69,6 @@ DEPEND="${RDEPEND} |
| 31 |
dev-python/recommonmark[${PYTHON_USEDEP}] |
| 32 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 33 |
') ) |
| 34 |
- gold? ( sys-libs/binutils-libs ) |
| 35 |
libffi? ( virtual/pkgconfig ) |
| 36 |
!!<dev-python/configparser-3.3.0.2 |
| 37 |
${PYTHON_DEPS}" |
| 38 |
@@ -74,7 +76,6 @@ DEPEND="${RDEPEND} |
| 39 |
# installed means llvm-config there will take precedence. |
| 40 |
RDEPEND="${RDEPEND} |
| 41 |
!sys-devel/llvm:0" |
| 42 |
-BDEPEND="dev-lang/perl" |
| 43 |
PDEPEND="sys-devel/llvm-common |
| 44 |
gold? ( >=sys-devel/llvmgold-${SLOT} )" |
| 45 |
|
| 46 |
@@ -86,8 +87,8 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
| 47 |
python_check_deps() { |
| 48 |
use doc || return 0 |
| 49 |
|
| 50 |
- has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && |
| 51 |
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 52 |
+ has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && |
| 53 |
+ has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 54 |
} |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
|
| 58 |
diff --git a/sys-devel/llvm/llvm-9.0.0.9999.ebuild b/sys-devel/llvm/llvm-9.0.0.9999.ebuild |
| 59 |
index f294d093706..937bff8cf3b 100644 |
| 60 |
--- a/sys-devel/llvm/llvm-9.0.0.9999.ebuild |
| 61 |
+++ b/sys-devel/llvm/llvm-9.0.0.9999.ebuild |
| 62 |
@@ -53,6 +53,9 @@ RDEPEND=" |
| 63 |
z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )" |
| 64 |
# configparser-3.2 breaks the build (3.3 or none at all are fine) |
| 65 |
DEPEND="${RDEPEND} |
| 66 |
+ gold? ( sys-libs/binutils-libs )" |
| 67 |
+BDEPEND=" |
| 68 |
+ dev-lang/perl |
| 69 |
|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 |
| 70 |
( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) |
| 71 |
) |
| 72 |
@@ -64,7 +67,6 @@ DEPEND="${RDEPEND} |
| 73 |
dev-python/recommonmark[${PYTHON_USEDEP}] |
| 74 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 75 |
') ) |
| 76 |
- gold? ( sys-libs/binutils-libs ) |
| 77 |
libffi? ( virtual/pkgconfig ) |
| 78 |
!!<dev-python/configparser-3.3.0.2 |
| 79 |
${PYTHON_DEPS}" |
| 80 |
@@ -72,7 +74,6 @@ DEPEND="${RDEPEND} |
| 81 |
# installed means llvm-config there will take precedence. |
| 82 |
RDEPEND="${RDEPEND} |
| 83 |
!sys-devel/llvm:0" |
| 84 |
-BDEPEND="dev-lang/perl" |
| 85 |
PDEPEND="sys-devel/llvm-common |
| 86 |
gold? ( >=sys-devel/llvmgold-${SLOT} )" |
| 87 |
|
| 88 |
@@ -84,8 +85,8 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
| 89 |
python_check_deps() { |
| 90 |
use doc || return 0 |
| 91 |
|
| 92 |
- has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && |
| 93 |
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 94 |
+ has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && |
| 95 |
+ has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 96 |
} |
| 97 |
|
| 98 |
src_prepare() { |
Archives