| 1 |
floppym 12/02/01 20:46:19 |
| 2 |
|
| 3 |
Modified: |
| 4 |
pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch |
| 5 |
Log: |
| 6 |
Updated patch from Arfrever. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 30 Jan 2012 15:50:35 -0000 1.1 |
| 24 |
+++ pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 1 Feb 2012 20:46:19 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
--- lib-python/modified-2.7/distutils/ccompiler.py |
| 27 |
+++ lib-python/modified-2.7/distutils/ccompiler.py |
| 28 |
-@@ -27,10 +27,12 @@ |
| 29 |
+@@ -27,10 +27,16 @@ |
| 30 |
varies across Unices and is stored in Python's Makefile. |
| 31 |
""" |
| 32 |
if compiler.compiler_type == "unix": |
| 33 |
@@ -8,16 +8,20 @@ |
| 34 |
- _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', |
| 35 |
- 'CCSHARED', 'LDSHARED', 'SO', 'AR', |
| 36 |
- 'ARFLAGS') |
| 37 |
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ |
| 38 |
-+ _sysconfig.get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', |
| 39 |
-+ 'LDCXXSHARED', 'SO', 'AR', 'ARFLAGS') |
| 40 |
++ cc = ' '.join(compiler.compiler) |
| 41 |
++ cxx = ' '.join(compiler.compiler_cxx) |
| 42 |
++ ldshared = ' '.join(compiler.linker_so) |
| 43 |
++ ldcxxshared = ' '.join(compiler.linker_so_cxx) |
| 44 |
++ ar = compiler.archiver[0] |
| 45 |
+ |
| 46 |
+ cflags = '' |
| 47 |
+ cxxflags = '' |
| 48 |
++ ccshared = '-fPIC' |
| 49 |
++ ar_flags = compiler.archiver[1] |
| 50 |
|
| 51 |
if 'CC' in os.environ: |
| 52 |
cc = os.environ['CC'] |
| 53 |
-@@ -38,19 +40,27 @@ |
| 54 |
+@@ -38,19 +44,27 @@ |
| 55 |
cxx = os.environ['CXX'] |
| 56 |
if 'LDSHARED' in os.environ: |
| 57 |
ldshared = os.environ['LDSHARED'] |
| 58 |
@@ -46,7 +50,7 @@ |
| 59 |
if 'AR' in os.environ: |
| 60 |
ar = os.environ['AR'] |
| 61 |
if 'ARFLAGS' in os.environ: |
| 62 |
-@@ -59,13 +69,17 @@ |
| 63 |
+@@ -59,17 +73,19 @@ |
| 64 |
archiver = ar + ' ' + ar_flags |
| 65 |
|
| 66 |
cc_cmd = cc + ' ' + cflags |
| 67 |
@@ -64,7 +68,11 @@ |
| 68 |
+ linker_exe_cxx=cxx, |
| 69 |
archiver=archiver) |
| 70 |
|
| 71 |
- compiler.shared_lib_extension = so_ext |
| 72 |
+- compiler.shared_lib_extension = so_ext |
| 73 |
+- |
| 74 |
+ class CCompiler: |
| 75 |
+ """Abstract base class to define the interface that must be implemented |
| 76 |
+ by real compiler classes. Also has some utility methods used by |
| 77 |
--- lib-python/modified-2.7/distutils/cygwinccompiler.py |
| 78 |
+++ lib-python/modified-2.7/distutils/cygwinccompiler.py |
| 79 |
@@ -135,9 +135,13 @@ |
Archives