diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-02-01 20:46:19 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-02-01 20:46:19 +0000 |
| commit | cf272a16a2ad9224c2b9823caec41eab3927ca89 (patch) | |
| tree | 92f090a6fcf5387e15c58f21cc6fab669d8a0794 /dev-python/pypy | |
| parent | Marking gtk-syntax-20110214-r1 ppc for bug 391473 (diff) | |
| download | gentoo-2-cf272a16a2ad9224c2b9823caec41eab3927ca89.tar.gz gentoo-2-cf272a16a2ad9224c2b9823caec41eab3927ca89.tar.bz2 gentoo-2-cf272a16a2ad9224c2b9823caec41eab3927ca89.zip | |
Updated patch from Arfrever.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pypy')
| -rw-r--r-- | dev-python/pypy/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch | 22 | ||||
| -rw-r--r-- | dev-python/pypy/pypy-1.7-r2.ebuild (renamed from dev-python/pypy/pypy-1.7-r1.ebuild) | 2 |
3 files changed, 24 insertions, 9 deletions
diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog index 078f91ae5a16..3b4fb83e8b59 100644 --- a/dev-python/pypy/ChangeLog +++ b/dev-python/pypy/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pypy # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.8 2012/01/30 15:50:35 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.9 2012/02/01 20:46:19 floppym Exp $ + +*pypy-1.7-r2 (01 Feb 2012) + + 01 Feb 2012; Mike Gilbert <floppym@gentoo.org> +pypy-1.7-r2.ebuild, + -pypy-1.7-r1.ebuild, + files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch: + Updated patch from Arfrever. *pypy-1.7-r1 (30 Jan 2012) diff --git a/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch b/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch index d2fddce3ee7b..1252d27cfd2a 100644 --- a/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch +++ b/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch @@ -1,6 +1,6 @@ --- lib-python/modified-2.7/distutils/ccompiler.py +++ lib-python/modified-2.7/distutils/ccompiler.py -@@ -27,10 +27,12 @@ +@@ -27,10 +27,16 @@ varies across Unices and is stored in Python's Makefile. """ if compiler.compiler_type == "unix": @@ -8,16 +8,20 @@ - _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', - 'CCSHARED', 'LDSHARED', 'SO', 'AR', - 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ _sysconfig.get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', -+ 'LDCXXSHARED', 'SO', 'AR', 'ARFLAGS') ++ cc = ' '.join(compiler.compiler) ++ cxx = ' '.join(compiler.compiler_cxx) ++ ldshared = ' '.join(compiler.linker_so) ++ ldcxxshared = ' '.join(compiler.linker_so_cxx) ++ ar = compiler.archiver[0] + + cflags = '' + cxxflags = '' ++ ccshared = '-fPIC' ++ ar_flags = compiler.archiver[1] if 'CC' in os.environ: cc = os.environ['CC'] -@@ -38,19 +40,27 @@ +@@ -38,19 +44,27 @@ cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: ldshared = os.environ['LDSHARED'] @@ -46,7 +50,7 @@ if 'AR' in os.environ: ar = os.environ['AR'] if 'ARFLAGS' in os.environ: -@@ -59,13 +69,17 @@ +@@ -59,17 +73,19 @@ archiver = ar + ' ' + ar_flags cc_cmd = cc + ' ' + cflags @@ -64,7 +68,11 @@ + linker_exe_cxx=cxx, archiver=archiver) - compiler.shared_lib_extension = so_ext +- compiler.shared_lib_extension = so_ext +- + class CCompiler: + """Abstract base class to define the interface that must be implemented + by real compiler classes. Also has some utility methods used by --- lib-python/modified-2.7/distutils/cygwinccompiler.py +++ lib-python/modified-2.7/distutils/cygwinccompiler.py @@ -135,9 +135,13 @@ diff --git a/dev-python/pypy/pypy-1.7-r1.ebuild b/dev-python/pypy/pypy-1.7-r2.ebuild index bbbe677d151b..3470d7ba2175 100644 --- a/dev-python/pypy/pypy-1.7-r1.ebuild +++ b/dev-python/pypy/pypy-1.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r1.ebuild,v 1.1 2012/01/30 15:50:35 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v 1.1 2012/02/01 20:46:19 floppym Exp $ EAPI="4" |