Gentoo Archives: gentoo-python

From: "Michał Górny" <mgorny@g.o>
To: gentoo-python@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-python] [PATCH python-r1] Move validity checks into _python_obtain_impls.
Date: Wed, 06 Mar 2013 14:31:11
Message-Id: 1362580294-3336-1-git-send-email-mgorny@gentoo.org
1 That is, _python_check_USE_PYTHON and _python_validate_useflags. Those
2 are always used along with per-implementation tasks, so better to have
3 them in _python_obtain_impls than call three functions every time.
4
5 Also, remove redundant invocation.
6
7 Note: rebased on multibuild_copy_sources() patch branch.
8 ---
9 gx86/eclass/python-r1.eclass | 11 +++--------
10 1 file changed, 3 insertions(+), 8 deletions(-)
11
12 diff --git a/gx86/eclass/python-r1.eclass b/gx86/eclass/python-r1.eclass
13 index 36b20dc..9e625f5 100644
14 --- a/gx86/eclass/python-r1.eclass
15 +++ b/gx86/eclass/python-r1.eclass
16 @@ -357,9 +357,6 @@ python_gen_cond_dep() {
17 python_copy_sources() {
18 debug-print-function ${FUNCNAME} "${@}"
19
20 - _python_validate_useflags
21 - _python_check_USE_PYTHON
22 -
23 local MULTIBUILD_VARIANTS
24 _python_obtain_impls
25
26 @@ -579,6 +576,9 @@ _python_check_USE_PYTHON() {
27 # @DESCRIPTION:
28 # Set up the enabled implementation list.
29 _python_obtain_impls() {
30 + _python_validate_useflags
31 + _python_check_USE_PYTHON
32 +
33 MULTIBUILD_VARIANTS=()
34
35 for impl in "${_PYTHON_ALL_IMPLS[@]}"; do
36 @@ -621,9 +621,6 @@ _python_multibuild_wrapper() {
37 python_foreach_impl() {
38 debug-print-function ${FUNCNAME} "${@}"
39
40 - _python_validate_useflags
41 - _python_check_USE_PYTHON
42 -
43 local MULTIBUILD_VARIANTS
44 _python_obtain_impls
45
46 @@ -695,8 +692,6 @@ python_export_best() {
47 python_replicate_script() {
48 debug-print-function ${FUNCNAME} "${@}"
49
50 - _python_validate_useflags
51 -
52 local suffixes=()
53
54 _add_suffix() {
55 --
56 1.8.1.5

Replies