diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-06-12 22:30:39 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-06-12 22:32:56 +0200 |
| commit | 48fd5f1f3f0bed2ff6dedd20435df54d7520e34c (patch) | |
| tree | d94fe5cac98f672b660c263271f74b3d47900732 /eclass | |
| parent | dev-libs/elfutils: arm stable, bug #585476 (diff) | |
| download | gentoo-48fd5f1f3f0bed2ff6dedd20435df54d7520e34c.tar.gz gentoo-48fd5f1f3f0bed2ff6dedd20435df54d7520e34c.tar.bz2 gentoo-48fd5f1f3f0bed2ff6dedd20435df54d7520e34c.zip | |
python-any-r1.eclass: Ensure not to emit := in || () deps
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python-any-r1.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index c6dfc9c7aecb..0b49944c5199 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -137,7 +137,8 @@ _python_any_set_globals() { for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do python_export "${i}" PYTHON_PKG_DEP - PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}" + # note: need to strip '=' slot operator for || deps + PYTHON_DEPS="${PYTHON_PKG_DEP%=} ${PYTHON_DEPS}" done PYTHON_DEPS="|| ( ${PYTHON_DEPS})" readonly PYTHON_DEPS @@ -220,7 +221,8 @@ python_gen_any_dep() { python_export "${i}" PYTHON_PKG_DEP local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} - out="( ${PYTHON_PKG_DEP} ${i_depstr} ) ${out}" + # note: need to strip '=' slot operator for || deps + out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}" done echo "|| ( ${out})" } |