From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RC87q-0001M0-36 for garchives@archives.gentoo.org; Fri, 07 Oct 2011 10:57:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5120C21C02B; Fri, 7 Oct 2011 10:57:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 134FE21C02B for ; Fri, 7 Oct 2011 10:57:51 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5891A1B4031 for ; Fri, 7 Oct 2011 10:57:50 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2256) id 13A362004B; Fri, 7 Oct 2011 10:57:49 +0000 (UTC) From: "Dirkjan Ochtman (djc)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, djc@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: python.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: python.eclass X-VCS-Directories: eclass X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman Content-Type: text/plain; charset=utf8 Message-Id: <20111007105749.13A362004B@flycatcher.gentoo.org> Date: Fri, 7 Oct 2011 10:57:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: dba1e3c73c4b408acb8be1c2edbfa1f7 djc 11/10/07 10:57:49 Modified: python.eclass Log: Improve support for PyPy in python_mod_optimize(). (Patch by Arfrever.) Revision Changes Path 1.138 eclass/python.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?rev=3D1.138&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?rev=3D1.138&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?r1=3D1.137&r2=3D1.138 Index: python.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- python.eclass 7 Oct 2011 10:55:51 -0000 1.137 +++ python.eclass 7 Oct 2011 10:57:48 -0000 1.138 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.137 2011/10/= 07 10:55:51 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.138 2011/10/= 07 10:57:48 djc Exp $ =20 # @ECLASS: python.eclass # @MAINTAINER: @@ -2862,7 +2862,7 @@ eval "dirs+=3D(\"\${root}${dir}\")" done stderr+=3D"${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@= ]}" "${dirs[@]}" 2>&1)" || return_code=3D"1" - if [[ "$(_python_get_implementation "${PYTHON_ABI}")" !=3D "Jython"= ]]; then + if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyP= y; then "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/= null || return_code=3D"1" fi _python_clean_compiled_modules "${dirs[@]}" @@ -2875,7 +2875,7 @@ eval "files+=3D(\"\${root}${file}\")" done stderr+=3D"${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}= " 2>&1)" || return_code=3D"1" - if [[ "$(_python_get_implementation "${PYTHON_ABI}")" !=3D "Jython"= ]]; then + if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyP= y; then "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_= code=3D"1" fi _python_clean_compiled_modules "${files[@]}" @@ -2906,14 +2906,14 @@ ebegin "Compilation and optimization of Python modules placed outside= of site-packages directories for $(python_get_implementation_and_version= )" if ((${#other_dirs[@]})); then stderr+=3D"${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall= "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code=3D"1" - if [[ "$(_python_get_implementation "${PYTHON_ABI}")" !=3D "Jython" = ]]; then + if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy= ; then "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other= _dirs[@]}" &> /dev/null || return_code=3D"1" fi _python_clean_compiled_modules "${other_dirs[@]}" fi if ((${#other_files[@]})); then stderr+=3D"${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile= "${other_files[@]}" 2>&1)" || return_code=3D"1" - if [[ "$(_python_get_implementation "${PYTHON_ABI}")" !=3D "Jython" = ]]; then + if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy= ; then "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /= dev/null || return_code=3D"1" fi _python_clean_compiled_modules "${other_files[@]}"