pool/python
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 156796 from devel:languages:python:Factory

Browse Source 
- Add aarch64 to the list of lib64 platforms (forwarded request 156732 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/156796
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=89
This commit is contained in:
Stephan Kulow 2013-03-01 06:47:17 +00:00 committed by Git OBS Bridge
commit 89f0b689fb
10 changed files with 3299 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3220
ctypes-libffi-aarch64.patch Normal file
View File

File diff suppressed because it is too large Load Diff

36
python-2.7.3-multiprocessing-join.patch Normal file
View File

@ -0,0 +1,36 @@
# HG changeset patch
# User Richard Oudkerk <shibturn@gmail.com>
# Date 1340030251 -3600
# Node ID 4c07b9c49b75a10874d98841bb2d826f118835a3
# Parent 8b38a81ba3bfa0535b3e7719c3b0e62343a56698
Issue #15101: Make pool finalizer avoid joining current thread
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -489,7 +489,8 @@ class Pool(object):
# We must wait for the worker handler to exit before terminating
# workers because we don't want workers to be restarted behind our back.
debug('joining worker handler')
- worker_handler.join()
+ if threading.current_thread() is not worker_handler:
+ worker_handler.join(1e100)
# Terminate workers which haven't already finished.
if pool and hasattr(pool[0], 'terminate'):
@@ -499,10 +500,12 @@ class Pool(object):
p.terminate()
debug('joining task handler')
- task_handler.join(1e100)
+ if threading.current_thread() is not task_handler:
+ task_handler.join(1e100)
debug('joining result handler')
- result_handler.join(1e100)
+ if threading.current_thread() is not result_handler:
+ result_handler.join(1e100)
if pool and hasattr(pool[0], 'terminate'):
debug('joining pool workers')

2
python-2.7.3rc2-multilib.patch
View File

@ -33,7 +33,7 @@ Index: configure.in
+esac +esac
+ +
+case $ARCH:$python_cv_cc_64bit_output in +case $ARCH:$python_cv_cc_64bit_output in
+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) +aarch64:yes | ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+ LIB="lib64" + LIB="lib64"
+ ;; + ;;
+*:*) +*:*)

17
python-base.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Feb 27 17:04:32 UTC 2013 - schwab@suse.de
- Add aarch64 to the list of lib64 platforms
-------------------------------------------------------------------
Sat Feb 9 16:24:10 UTC 2013 - schwab@suse.de
- Add ctypes-libffi-aarch64.patch: import aarch64 support for libffi in
_ctypes module
-------------------------------------------------------------------
Fri Feb 8 14:49:45 UTC 2013 - jmatejek@suse.com
- multiprocessing: thread joining itself (bnc#747794)
- gettext: fix cases where no bundle is found (bnc#794139)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 25 11:21:06 UTC 2012 - coolo@suse.com Thu Oct 25 11:21:06 UTC 2012 - coolo@suse.com

5
python-base.spec
View File

@ -52,6 +52,9 @@ Patch18: python-2.7.3-ssl_ca_path.patch
Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch
# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle. # 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 Patch20: python-bundle-lang.patch
Patch21: python-2.7.3-multiprocessing-join.patch
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.patch
# COMMON-PATCH-END # COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3) %define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake BuildRequires: automake
@ -142,6 +145,8 @@ other applications.
%patch18 %patch18
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1
%patch22 -p1
# COMMON-PREP-END # COMMON-PREP-END
# drop Autoconf version requirement # drop Autoconf version requirement

2
python-bundle-lang.patch
View File

@ -16,7 +16,7 @@ Index: Python-2.7.3/Lib/gettext.py
def find(domain, localedir=None, languages=None, all=0): def find(domain, localedir=None, languages=None, all=0):
+ if localedir in [None, _default_localedir]: + if localedir in [None, _default_localedir]:
+ bundle = find(domain, localedir=_default_bundlelocaledir, languages=languages, all=all) + bundle = find(domain, localedir=_default_bundlelocaledir, languages=languages, all=all)
+ if len(bundle): + if bundle:
+ return bundle + return bundle
# Get some reasonable defaults for arguments that were not supplied # Get some reasonable defaults for arguments that were not supplied
if localedir is None: if localedir is None:

5
python-doc.spec
View File

@ -49,6 +49,9 @@ Patch18: python-2.7.3-ssl_ca_path.patch
Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch
# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle. # 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 Patch20: python-bundle-lang.patch
Patch21: python-2.7.3-multiprocessing-join.patch
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.patch
# COMMON-PATCH-END # COMMON-PATCH-END
Provides: pyth_doc Provides: pyth_doc
Provides: pyth_ps Provides: pyth_ps
@ -98,6 +101,8 @@ Python, and Macintosh Module Reference in PDF format.
%patch18 %patch18
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1
%patch22 -p1
# COMMON-PREP-END # COMMON-PREP-END
%build %build

5
python.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 25 17:24:52 UTC 2013 - jmatejek@suse.com
- fix pythonstart failing on $HOME-less users (bnc#804978)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Aug 12 11:46:22 UTC 2012 - idonmez@suse.com Sun Aug 12 11:46:22 UTC 2012 - idonmez@suse.com

5
python.spec
View File

@ -57,6 +57,9 @@ Patch18: python-2.7.3-ssl_ca_path.patch
Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch
# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 dimstar@opensuse.org -- gettext: when looking in default_localedir also check in locale-bundle. # 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 Patch20: python-bundle-lang.patch
Patch21: python-2.7.3-multiprocessing-join.patch
# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module
Patch22: ctypes-libffi-aarch64.patch
# COMMON-PATCH-END # COMMON-PATCH-END
BuildRequires: automake BuildRequires: automake
BuildRequires: db-devel BuildRequires: db-devel
@ -181,6 +184,8 @@ implementation of the standard Unix DBM databases.
%patch18 %patch18
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1
%patch22 -p1
# COMMON-PREP-END # COMMON-PREP-END
# drop Autoconf version requirement # drop Autoconf version requirement

3
pythonstart
View File

@ -13,7 +13,10 @@ historyPath = os.path.expanduser("~/.pyhistory")
# handler for saving history # handler for saving history
def save_history(historyPath=historyPath): def save_history(historyPath=historyPath):
import readline import readline
try:
readline.write_history_file(historyPath) readline.write_history_file(historyPath)
except:
pass
# read history, if it exists # read history, if it exists
if os.path.exists(historyPath): if os.path.exists(historyPath):