classification
Title: fficonfig.py.in wrong for AIX
Type: behavior Stage: resolved
Components: Extension Modules Versions: Python 3.4, Python 3.3
process
Status: closed Resolution: fixed
Dependencies: Superseder:
Assigned To: Nosy List: David.Edelsohn, amaury.forgeotdarc, belopolsky, haypo, meador.inge, python-dev
Priority: normal Keywords:

Created on 2013-06-18 00:20 by David.Edelsohn, last changed 2013-06-19 16:04 by haypo. This issue is now closed.

Messages (3)
msg191381 - (view) Author: David Edelsohn (David.Edelsohn) * Date: 2013-06-18 00:20
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'],
msg191433 - (view) Author: Amaury Forgeot d'Arc (amaury.forgeotdarc) * (Python committer) Date: 2013-06-18 20:46
LGTM. I checked in Makefile.am, and the list of platform-specific files is the same.
msg191484 - (view) Author: Roundup Robot (python-dev) Date: 2013-06-19 16:02
New changeset 00082406e13f by Benjamin Peterson in branch '3.3':
fix libffi build on AIX (closes #18248)
http://hg.python.org/cpython/rev/00082406e13f

New changeset 974d4844d5a7 by Benjamin Peterson in branch 'default':
merge 3.3 (#18248)
http://hg.python.org/cpython/rev/974d4844d5a7
History
Date User Action Args
2013-06-19 16:04:41hayposetversions: - Python 2.7
2013-06-19 16:02:53python-devsetstatus: open -> closed

nosy: + python-dev
messages: + msg191484

resolution: fixed
stage: patch review -> resolved
2013-06-18 20:46:33amaury.forgeotdarcsetmessages: + msg191433
2013-06-18 20:24:19pitrousetnosy: + amaury.forgeotdarc, belopolsky, meador.inge
stage: patch review

versions: - Python 3.5
2013-06-18 00:21:47hayposetnosy: + haypo
2013-06-18 00:20:24David.Edelsohncreate