diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-11-30 11:47:55 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-12-07 15:36:31 +0100 |
| commit | 9c4fe911d04d36d390786f1b9cecbbf60f10532a (patch) | |
| tree | 48fc40b0804e33947b15dc68325a30d492c4ca3e | |
| parent | python-single-r1.eclass: Introduce PYTHON_{SINGLE,MULTI}_USEDEP API (diff) | |
| download | gentoo-9c4fe911d04d36d390786f1b9cecbbf60f10532a.tar.gz gentoo-9c4fe911d04d36d390786f1b9cecbbf60f10532a.tar.bz2 gentoo-9c4fe911d04d36d390786f1b9cecbbf60f10532a.zip | |
python-single-r1.eclass: Use new-style flags for python-exec dep
Depend on PYTHON_TARGETS directly in dev-lang/python-exec dep,
instead of relying on old-style PYTHON_USEDEP.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | eclass/python-single-r1.eclass | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index ad7e39558cf1..f042bf4e1167 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -250,15 +250,16 @@ _python_single_set_globals() { requse+=" python_single_target_${i}? ( python_targets_${i} )" python_export "${i}" PYTHON_PKG_DEP - deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) " + # 1) well, python-exec would suffice as an RDEP + # but no point in making this overcomplex, BDEP doesn't hurt anyone + # 2) python-exec should be built with all targets forced anyway + # but if new targets were added, we may need to force a rebuild + deps+="python_single_target_${i}? ( + ${PYTHON_PKG_DEP} + >=dev-lang/python-exec-2:=[python_targets_${i}] + ) " done - # 1) well, python-exec would suffice as an RDEP - # but no point in making this overcomplex, BDEP doesn't hurt anyone - # 2) python-exec should be built with all targets forced anyway - # but if new targets were added, we may need to force a rebuild - deps+=">=dev-lang/python-exec-2:=[${usedep}]" - if [[ ${PYTHON_DEPS+1} ]]; then if [[ ${PYTHON_DEPS} != "${deps}" ]]; then eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!" |