From 9877de58c45f171352813407c7a7f694e4b49bc5e4863838c1bae733c2c52acb Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Mon, 22 Dec 2014 16:49:53 +0000 Subject: [PATCH] Accepting request 266105 from home:Andreas_Schwab:Factory - python-2.7.4-aarch64.patch: Remove obsolete patch - python-2.7-libffi-aarch64.patch: Fix argument passing in libffi for aarch64 OBS-URL: https://build.opensuse.org/request/show/266105 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=173 --- python-2.7-libffi-aarch64.patch | 13 +++++++++++++ python-2.7.4-aarch64.patch | 18 ------------------ python-base.changes | 7 +++++++ python-base.spec | 4 ++-- python-doc.spec | 4 ++-- python.spec | 4 ++-- 6 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 python-2.7-libffi-aarch64.patch delete mode 100644 python-2.7.4-aarch64.patch diff --git a/python-2.7-libffi-aarch64.patch b/python-2.7-libffi-aarch64.patch new file mode 100644 index 0000000..77a398d --- /dev/null +++ b/python-2.7-libffi-aarch64.patch @@ -0,0 +1,13 @@ +Index: Python-2.7.9/Modules/_ctypes/libffi/src/aarch64/ffi.c +=================================================================== +--- Python-2.7.9.orig/Modules/_ctypes/libffi/src/aarch64/ffi.c ++++ Python-2.7.9/Modules/_ctypes/libffi/src/aarch64/ffi.c +@@ -728,7 +728,7 @@ aarch64_prep_args (struct call_context * + state.ngrn = N_X_ARG_REG; + + memcpy (allocate_to_stack (&state, stack, ty->alignment, +- ty->size), ecif->avalue + i, ty->size); ++ ty->size), ecif->avalue[i], ty->size); + } + break; + diff --git a/python-2.7.4-aarch64.patch b/python-2.7.4-aarch64.patch deleted file mode 100644 index 08ba662..0000000 --- a/python-2.7.4-aarch64.patch +++ /dev/null @@ -1,18 +0,0 @@ -# HG changeset patch -# User Andreas Schwab -# Date 1367276434 -7200 -# Node ID 05e8999a3901b4853e60d6701510e9b3dd54a7f3 -# Parent 84cef4f1999ad9e362694cdac2f65f0981e3d5d0 -Add missing fficonfig.py bits for aarch64 - -diff -r 84cef4f1999a -r 05e8999a3901 Modules/_ctypes/libffi/fficonfig.py.in ---- a/Modules/_ctypes/libffi/fficonfig.py.in Mon Apr 29 16:09:39 2013 -0400 -+++ b/Modules/_ctypes/libffi/fficonfig.py.in Tue Apr 30 01:00:34 2013 +0200 -@@ -28,6 +28,7 @@ - 'PA': ['src/pa/linux.S', 'src/pa/ffi.c'], - 'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'], - 'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'], -+ 'AARCH64' : ['src/aarch64/ffi.c', 'src/aarch64/sysv.S'], - } - - ffi_sources += ffi_platforms['@TARGET@'] diff --git a/python-base.changes b/python-base.changes index 81b961e..bbbd72c 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Dec 21 19:14:17 UTC 2014 - schwab@suse.de + +- python-2.7.4-aarch64.patch: Remove obsolete patch +- python-2.7-libffi-aarch64.patch: Fix argument passing in libffi for + aarch64 + ------------------------------------------------------------------- Fri Dec 12 17:11:51 UTC 2014 - jmatejek@suse.com diff --git a/python-base.spec b/python-base.spec index e67f943..408293e 100644 --- a/python-base.spec +++ b/python-base.spec @@ -45,8 +45,8 @@ Patch13: python-2.7.2-fix_date_time_compiler.patch Patch17: remove-static-libpython.diff # PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle. Patch20: python-bundle-lang.patch -# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module -Patch22: python-2.7.4-aarch64.patch +# PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 +Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff # PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) Patch31: python-2.7.7-mhlib-linkcount.patch diff --git a/python-doc.spec b/python-doc.spec index 8924ad6..5eca6c8 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -45,8 +45,8 @@ Patch13: python-2.7.2-fix_date_time_compiler.patch Patch17: remove-static-libpython.diff # PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle. Patch20: python-bundle-lang.patch -# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module -Patch22: python-2.7.4-aarch64.patch +# PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 +Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff # PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) Patch31: python-2.7.7-mhlib-linkcount.patch diff --git a/python.spec b/python.spec index 9b577ab..cdb08d0 100644 --- a/python.spec +++ b/python.spec @@ -49,8 +49,8 @@ Patch13: python-2.7.2-fix_date_time_compiler.patch Patch17: remove-static-libpython.diff # PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle. Patch20: python-bundle-lang.patch -# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module -Patch22: python-2.7.4-aarch64.patch +# PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 +Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff # PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) Patch31: python-2.7.7-mhlib-linkcount.patch