diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-08-29 02:15:24 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-08-29 02:15:24 +0000 |
| commit | c9be2f93521f3058ea7b533481da03b2752d0288 (patch) | |
| tree | 625a01edb591745849592b8eb67ba6e2e0b238ea /eclass | |
| parent | Version bump. (diff) | |
| download | historical-c9be2f93521f3058ea7b533481da03b2752d0288.tar.gz historical-c9be2f93521f3058ea7b533481da03b2752d0288.tar.bz2 historical-c9be2f93521f3058ea7b533481da03b2752d0288.zip | |
Ensure that defined functions are passed to python_execute_function(). Add PYTHON_DEFINE_DEFAULT_FUNCTIONS variable.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python.eclass | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/eclass/python.eclass b/eclass/python.eclass index 940b7cb04e76..d0d5aaac913a 100644 --- a/eclass/python.eclass +++ b/eclass/python.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.66 2009/08/28 16:08:51 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.67 2009/08/29 02:15:24 arfrever Exp $ # @ECLASS: python.eclass # @MAINTAINER: @@ -233,7 +233,7 @@ python_execute_function() { separate_build_dirs="1" ;; -*) - die "${FUNCNAME}(): Unrecognized option $1" + die "${FUNCNAME}(): Unrecognized option '$1'" ;; *) break @@ -248,12 +248,16 @@ python_execute_function() { fi function="$1" shift + + if [[ -z "$(type -t "${function}")" ]]; then + die "${FUNCNAME}(): '${function}' function isn't defined" + fi else if [[ "$#" -ne "0" ]]; then - die "${FUNCNAME}(): --default-function option and function name cannot be specified simultaneously" + die "${FUNCNAME}(): '--default-function' option and function name cannot be specified simultaneously" fi if has "${EAPI:-0}" 0 1; then - die "${FUNCNAME}(): --default-function option cannot be used in this EAPI" + die "${FUNCNAME}(): '--default-function' option cannot be used in this EAPI" fi if [[ "${EBUILD_PHASE}" == "configure" ]]; then @@ -392,7 +396,7 @@ python_execute_function() { # @DESCRIPTION: # Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags # are respected. Only exported if one of those variables is set. -if ! has ${EAPI:-0} 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then +if ! has "${EAPI:-0}" 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then python_pkg_setup_fail() { eerror "${1}" die "${1}" @@ -444,6 +448,23 @@ if ! has ${EAPI:-0} 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} RDEPEND="${PYTHON_USE_WITH_ATOM}" fi +# @ECLASS-VARIABLE: PYTHON_DEFINE_DEFAULT_FUNCTIONS +# @DESCRIPTION: +# Set this to define default functions for the following ebuild phases: +# src_prepare, src_configure, src_compile, src_test, src_install. +if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_DEFINE_DEFAULT_FUNCTIONS}" ]]; then + python_src_prepare() { + python_copy_sources + } + + for python_default_function in src_configure src_compile src_test src_install; do + eval "python_${python_default_function}() { python_execute_function -d -s; }" + done + unset python_default_function + + EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install +fi + # @FUNCTION: python_disable_pyc # @DESCRIPTION: # Tell Python not to automatically recompile modules to .pyc/.pyo |