diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-06-19 09:01:58 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-06-19 09:01:58 -0700 |
| commit | 15a7d2e8d6cde1acedbe7b0c9991c72db9c16883 (patch) | |
| tree | 49c22acc5273a079b4bb2a34eabc2d94d28c22e0 | |
| parent | 10dc0eb5a400bf1c8a8568672fcd1923f8ef471c (diff) | |
| parent | 19886b8adccf0d02ec4091feda259aa60049432b (diff) | |
| download | cpython-git-15a7d2e8d6cde1acedbe7b0c9991c72db9c16883.tar.gz | |
merge 3.3 (#18248)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/libffi.diff | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/libffi/fficonfig.py.in | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -123,6 +123,8 @@ Core and Builtins Library ------- +- Issue #18248: Fix libffi build on AIX. + - Issue #18259: Declare sethostname in socketmodule.c for AIX - Issue #18147: Add diagnostic functions to ssl.SSLContext(). get_ca_list() diff --git a/Modules/_ctypes/libffi.diff b/Modules/_ctypes/libffi.diff index 71b1aa83ea..ade28e5f9e 100644 --- a/Modules/_ctypes/libffi.diff +++ b/Modules/_ctypes/libffi.diff @@ -135,7 +135,7 @@ diff -r -N -u libffi.orig/configure.ac libffi/configure.ac + '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 --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in index 27c971f86f..5a7fd083ad 100644 --- a/Modules/_ctypes/libffi/fficonfig.py.in +++ b/Modules/_ctypes/libffi/fficonfig.py.in @@ -16,7 +16,7 @@ ffi_platforms = { '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'], |