1 |
mgorny 13/03/02 07:17:50 |
2 |
|
3 |
Modified: ChangeLog distutils-r1.eclass |
4 |
Log: |
5 |
Run *_all() phases in best-impl sources, in an in-source build. |
6 |
|
7 |
Revision Changes Path |
8 |
1.698 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.698&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.698&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.697&r2=1.698 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.697 |
18 |
retrieving revision 1.698 |
19 |
diff -u -r1.697 -r1.698 |
20 |
--- ChangeLog 2 Mar 2013 07:16:43 -0000 1.697 |
21 |
+++ ChangeLog 2 Mar 2013 07:17:50 -0000 1.698 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.697 2013/03/02 07:16:43 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.698 2013/03/02 07:17:50 mgorny Exp $ |
27 |
+ |
28 |
+ 02 Mar 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
29 |
+ Run *_all() phases in best-impl sources, in an in-source build. |
30 |
|
31 |
02 Mar 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
32 |
Override build locations and set PYTHONPATH in in-source builds, to increase |
33 |
|
34 |
|
35 |
|
36 |
1.60 eclass/distutils-r1.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.60&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.60&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.59&r2=1.60 |
41 |
|
42 |
Index: distutils-r1.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v |
45 |
retrieving revision 1.59 |
46 |
retrieving revision 1.60 |
47 |
diff -u -r1.59 -r1.60 |
48 |
--- distutils-r1.eclass 2 Mar 2013 07:16:43 -0000 1.59 |
49 |
+++ distutils-r1.eclass 2 Mar 2013 07:17:50 -0000 1.60 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.59 2013/03/02 07:16:43 mgorny Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.60 2013/03/02 07:17:50 mgorny Exp $ |
55 |
|
56 |
# @ECLASS: distutils-r1 |
57 |
# @MAINTAINER: |
58 |
@@ -578,6 +578,9 @@ |
59 |
# @INTERNAL |
60 |
# @DESCRIPTION: |
61 |
# Run the given command, restoring the best-implementation state. |
62 |
+# |
63 |
+# If in-source build is used, the command will be run in the copy |
64 |
+# of sources made for the best Python interpreter. |
65 |
_distutils-r1_run_common_phase() { |
66 |
local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR} |
67 |
|
68 |
@@ -588,8 +591,16 @@ |
69 |
|
70 |
export EPYTHON PYTHON PYTHONPATH |
71 |
|
72 |
+ if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then |
73 |
+ pushd "${BUILD_DIR}"/.. >/dev/null || die |
74 |
+ fi |
75 |
+ |
76 |
einfo "common: running ${1}" |
77 |
"${@}" |
78 |
+ |
79 |
+ if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then |
80 |
+ popd >/dev/null || die |
81 |
+ fi |
82 |
} |
83 |
|
84 |
# @FUNCTION: _distutils-r1_multijob_init |