| 1 |
hawking 08/05/30 09:58:28 |
| 2 |
|
| 3 |
Modified: python.eclass |
| 4 |
Log: |
| 5 |
Second try to fix passing additional options to python_mod_optimize. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.41 eclass/python.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.41&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.41&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?r1=1.40&r2=1.41 |
| 13 |
|
| 14 |
Index: python.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
| 17 |
retrieving revision 1.40 |
| 18 |
retrieving revision 1.41 |
| 19 |
diff -u -r1.40 -r1.41 |
| 20 |
--- python.eclass 29 May 2008 22:03:59 -0000 1.40 |
| 21 |
+++ python.eclass 30 May 2008 09:58:28 -0000 1.41 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.40 2008/05/29 22:03:59 hawking Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.41 2008/05/30 09:58:28 hawking Exp $ |
| 27 |
|
| 28 |
# @ECLASS: python.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -194,8 +194,7 @@ |
| 31 |
myopts="${myopts} $1" |
| 32 |
;; |
| 33 |
-d|-x) |
| 34 |
- # -x takes regexp as argument so quoting is necessary. |
| 35 |
- myopts="${myopts} $1 \"$2\"" |
| 36 |
+ myopts="${myopts} $1 $2" |
| 37 |
shift |
| 38 |
;; |
| 39 |
-*) |
| 40 |
@@ -218,21 +217,17 @@ |
| 41 |
python_version |
| 42 |
fi |
| 43 |
|
| 44 |
- # set opts |
| 45 |
- if [ "${PYVER}" = "2.2" ]; then |
| 46 |
- compileopts="" |
| 47 |
- else |
| 48 |
- compileopts="-q" |
| 49 |
- fi |
| 50 |
+ # set additional opts |
| 51 |
+ myopts="${myopts} -q" |
| 52 |
|
| 53 |
ebegin "Byte compiling python modules for python-${PYVER} .." |
| 54 |
if [ -n "${mydirs}" ]; then |
| 55 |
python${PYVER} \ |
| 56 |
${myroot}/usr/$(get_libdir)/python${PYVER}/compileall.py \ |
| 57 |
- ${compileopts} ${myopts} ${mydirs} |
| 58 |
+ ${myopts} ${mydirs} |
| 59 |
python${PYVER} -O \ |
| 60 |
${myroot}/usr/$(get_libdir)/python${PYVER}/compileall.py \ |
| 61 |
- ${compileopts} ${myopts} ${mydirs} |
| 62 |
+ ${myopts} ${mydirs} |
| 63 |
fi |
| 64 |
|
| 65 |
if [ -n "${myfiles}" ]; then |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
-- |
| 70 |
gentoo-commits@l.g.o mailing list |
Archives