| 1 |
arfrever 09/08/05 18:34:57 |
| 2 |
|
| 3 |
Modified: distutils.eclass |
| 4 |
Log: |
| 5 |
Use PYTHON() instead of get_python(). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.58 eclass/distutils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?rev=1.58&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?rev=1.58&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/distutils.eclass?r1=1.57&r2=1.58 |
| 13 |
|
| 14 |
Index: distutils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v |
| 17 |
retrieving revision 1.57 |
| 18 |
retrieving revision 1.58 |
| 19 |
diff -u -r1.57 -r1.58 |
| 20 |
--- distutils.eclass 2 Aug 2009 00:30:29 -0000 1.57 |
| 21 |
+++ distutils.eclass 5 Aug 2009 18:34:56 -0000 1.58 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.57 2009/08/02 00:30:29 arfrever Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.58 2009/08/05 18:34:56 arfrever Exp $ |
| 27 |
|
| 28 |
# @ECLASS: distutils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -71,8 +71,8 @@ |
| 31 |
distutils_src_compile() { |
| 32 |
if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then |
| 33 |
build_modules() { |
| 34 |
- echo "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" "$@" |
| 35 |
- "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" "$@" |
| 36 |
+ echo "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" "$@" |
| 37 |
+ "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" "$@" |
| 38 |
} |
| 39 |
python_execute_function build_modules "$@" |
| 40 |
else |
| 41 |
@@ -86,6 +86,7 @@ |
| 42 |
# It also installs the "standard docs" (CHANGELOG, Change*, KNOWN_BUGS, MAINTAINERS, |
| 43 |
# PKG-INFO, CONTRIBUTORS, TODO, NEWS, MANIFEST*, README*, and AUTHORS) |
| 44 |
distutils_src_install() { |
| 45 |
+ local pylibdir |
| 46 |
|
| 47 |
# Mark the package to be rebuilt after a python upgrade. |
| 48 |
python_need_rebuild |
| 49 |
@@ -96,11 +97,11 @@ |
| 50 |
# a package uses distutils but does not install anything |
| 51 |
# in site-packages. (eg. dev-java/java-config-2.x) |
| 52 |
# - liquidx (14/08/2006) |
| 53 |
- pylibdir="$("$(get_python)" -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')" |
| 54 |
+ pylibdir="$("$(PYTHON)" -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')" |
| 55 |
[[ -n "${pylibdir}" ]] && dodir "${pylibdir}" |
| 56 |
|
| 57 |
- echo "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" |
| 58 |
- "$(get_python)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" |
| 59 |
+ echo "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" |
| 60 |
+ "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${D}" --no-compile "$@" |
| 61 |
} |
| 62 |
python_execute_function install_modules "$@" |
| 63 |
else |
Archives