➜

This issue tracker has been migrated to GitHub, and is currently read-only.
For more information, see the GitHub FAQs in the Python's Developer Guide.

Author David.Edelsohn
Recipients David.Edelsohn
Date 2013-06-18.00:20:23
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1371514824.57.0.542380875815.issue18248@psf.upfronthosting.co.za>
In-reply-to
Content 
fficonfig.py.in incorrectly mixes source files intended for Linux with source files intended for AIX, causing a build failure.

AIX uses ffi_darwin.c not ffi.c

diff -r f6f70f1ab124 Modules/_ctypes/libffi.diff
--- a/Modules/_ctypes/libffi.diff       Mon Jun 17 22:02:14 2013 +0200
+++ b/Modules/_ctypes/libffi.diff       Mon Jun 17 22:18:44 2013 -0700
@@ -135,7 +135,7 @@
 +    'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
 +    'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
 +    'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'],
-+    'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
++    'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
 +    'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
 +    'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
 +    'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
diff -r f6f70f1ab124 Modules/_ctypes/libffi/fficonfig.py.in
--- a/Modules/_ctypes/libffi/fficonfig.py.in    Mon Jun 17 22:02:14 2013 +0200
+++ b/Modules/_ctypes/libffi/fficonfig.py.in    Mon Jun 17 22:18:44 2013 -0700
@@ -16,7 +16,7 @@
     'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
     'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
     'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'],
-    'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
+    'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
     'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
     'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
     'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
History
Date User Action Args
2013-06-18 00:20:24David.Edelsohnsetrecipients: + David.Edelsohn
2013-06-18 00:20:24David.Edelsohnsetmessageid: <1371514824.57.0.542380875815.issue18248@psf.upfronthosting.co.za>
2013-06-18 00:20:24David.Edelsohnlinkissue18248 messages
2013-06-18 00:20:23David.Edelsohncreate