diff options
author | Michał Górny <mgorny@gentoo.org> | 2013-05-10 22:03:30 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2013-05-10 22:03:30 +0000 |
commit | 0b7bd3650f4d7afc577171b238422f1ea3093381 (patch) | |
tree | e882449b0aa305699106396de4b027b7bcfa9e55 | |
parent | sql -> dbi use flag (bug #410829) (diff) | |
download | historical-0b7bd3650f4d7afc577171b238422f1ea3093381.tar.gz historical-0b7bd3650f4d7afc577171b238422f1ea3093381.tar.bz2 historical-0b7bd3650f4d7afc577171b238422f1ea3093381.zip |
Consistently create ${EPYTHON} subdir for Python wrappers. Fixes conflict between Python & vala wrappers, bug #469312.
-rw-r--r-- | eclass/ChangeLog | 7 | ||||
-rw-r--r-- | eclass/python-any-r1.eclass | 8 | ||||
-rw-r--r-- | eclass/python-r1.eclass | 6 | ||||
-rw-r--r-- | eclass/python-single-r1.eclass | 4 | ||||
-rw-r--r-- | eclass/python-utils-r1.eclass | 8 |
5 files changed, 19 insertions, 14 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c10d1ea66a95..734fbfd3894d 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.817 2013/05/09 03:03:02 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.818 2013/05/10 22:03:30 mgorny Exp $ + + 10 May 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass, + python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass: + Consistently create ${EPYTHON} subdir for Python wrappers. Fixes conflict + between Python & vala wrappers, bug #469312. 09 May 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: Drop support for graphite in 4.4/4.5 due to incompatibilities with newer ppl diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 553276af17ef..087efb27a431 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.10 2013/04/30 05:34:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.11 2013/05/10 22:03:30 mgorny Exp $ # @ECLASS: python-any-r1 # @MAINTAINER: @@ -216,7 +216,7 @@ python-any-r1_pkg_setup() { if [[ ${EPYTHON} ]]; then if _python_EPYTHON_supported "${EPYTHON}"; then python_export EPYTHON PYTHON - python_wrapper_setup "${T}" + python_wrapper_setup return fi fi @@ -231,7 +231,7 @@ python-any-r1_pkg_setup() { break elif _python_EPYTHON_supported "${i}"; then python_export "${i}" EPYTHON PYTHON - python_wrapper_setup "${T}" + python_wrapper_setup return fi done @@ -247,7 +247,7 @@ python-any-r1_pkg_setup() { for i in "${rev_impls[@]}"; do python_export "${i}" EPYTHON PYTHON if _python_EPYTHON_supported "${EPYTHON}"; then - python_wrapper_setup "${T}" + python_wrapper_setup return fi done diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index d1cc4206d6af..84c923fe2170 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.53 2013/04/07 17:02:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.54 2013/05/10 22:03:30 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -639,7 +639,7 @@ _python_multibuild_wrapper() { local -x EPYTHON PYTHON local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH} python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON - python_wrapper_setup "${T}/${EPYTHON}" + python_wrapper_setup "${@}" } @@ -712,7 +712,7 @@ python_export_best() { debug-print "${FUNCNAME}: Best implementation is: ${best}" python_export "${best}" "${@}" - python_wrapper_setup "${T}" + python_wrapper_setup } # @FUNCTION: python_replicate_script diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 97d4a2102651..e6732a750ae7 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.16 2013/04/07 17:02:52 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.17 2013/05/10 22:03:30 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -207,7 +207,7 @@ python-single-r1_pkg_setup() { fi python_export "${impl}" EPYTHON PYTHON - python_wrapper_setup "${T}" + python_wrapper_setup fi done diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 9807d7fbc6a0..bbd308589a74 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.23 2013/04/30 05:36:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.24 2013/05/10 22:03:30 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -820,11 +820,11 @@ python_doheader() { } # @FUNCTION: python_wrapper_setup -# @USAGE: <path> [<impl>] +# @USAGE: [<path> [<impl>]] # @DESCRIPTION: # Create proper 'python' executable and pkg-config wrappers # (if available) in the directory named by <path>. Set up PATH -# and PKG_CONFIG_PATH appropriately. +# and PKG_CONFIG_PATH appropriately. <path> defaults to ${T}/${EPYTHON}. # # The wrappers will be created for implementation named by <impl>, # or for one named by ${EPYTHON} if no <impl> passed. @@ -836,7 +836,7 @@ python_doheader() { python_wrapper_setup() { debug-print-function ${FUNCNAME} "${@}" - local workdir=${1} + local workdir=${1:-${T}/${EPYTHON}} local impl=${2:-${EPYTHON}} [[ ${workdir} ]] || die "${FUNCNAME}: no workdir specified." |