gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-09 18:47:16 -08:00
Code Issues Projects Releases Wiki Activity

python-single-r1.eclass: Fix python_gen_* w/ single PYTHON_COMPAT impl

Browse Source 
Fix python_gen_useflags() and python_gen_cond_dep() to output correct
flag name when only a single implementation is listed in PYTHON_COMPAT.
In this case, the PYTHON_SINGLE_TARGET flags are not emitted
and PYTHON_TARGETS are used directly instead.
This commit is contained in:
Michał Górny
2015-12-22 23:12:23 +01:00
parent 33380ad5e1
commit 3923a952a7
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eclass/python-single-r1.eclass
+16 -4
View File
@@ -310,13 +310,19 @@ python_gen_usedep() {
python_gen_useflags() {
debug-print-function ${FUNCNAME} "${@}"
local impl pattern
local flag_prefix impl pattern
local matches=()
if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
flag_prefix=python_targets
else
flag_prefix=python_single_target
fi
for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
for pattern; do
if [[ ${impl} == ${pattern} ]]; then
matches+=( "python_single_target_${impl}" )
matches+=( "${flag_prefix}_${impl}" )
break
fi
done
@@ -354,9 +360,15 @@ python_gen_useflags() {
python_gen_cond_dep() {
debug-print-function ${FUNCNAME} "${@}"
local impl pattern
local flag_prefix impl pattern
local matches=()
if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
flag_prefix=python_targets
else
flag_prefix=python_single_target
fi
local dep=${1}
shift
@@ -371,7 +383,7 @@ python_gen_cond_dep() {
dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
fi
matches+=( "python_single_target_${impl}? ( ${dep} )" )
matches+=( "${flag_prefix}_${impl}? ( ${dep} )" )
break
fi
done