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

Accepting request 236960 from home:Andreas_Schwab:Factory

Browse Source 
- libev.patch: fix syntax error in preprocessor conditional

OBS-URL: https://build.opensuse.org/request/show/236960
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=13
This commit is contained in:
Sascha Peilicke 2014-06-17 09:03:51 +00:00 committed by Git OBS Bridge
parent 176638dfbc
commit 79b1f6ce3b
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libev.patch Normal file
View File

@ -0,0 +1,24 @@
Index: gevent-1.0/libev/ev.c
===================================================================
--- gevent-1.0.orig/libev/ev.c
+++ gevent-1.0/libev/ev.c
@@ -617,9 +617,16 @@ struct signalfd_siginfo
#if ECB_GCC_VERSION(4,7)
/* see comment below (stdatomic.h) about the C11 memory model. */
#define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
- #elif defined __clang && __has_feature (cxx_atomic)
- /* see comment below (stdatomic.h) about the C11 memory model. */
- #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
+
+ /* The __has_feature syntax from clang is so misdesigned that we cannot use it
+ * without risking compile time errors with other compilers. We *could*
+ * define our own ecb_clang_has_feature, but I just can't be bothered to work
+ * around this shit time and again.
+ * #elif defined __clang && __has_feature (cxx_atomic)
+ * // see comment below (stdatomic.h) about the C11 memory model.
+ * #define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
+ */
+
#elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
#define ECB_MEMORY_FENCE __sync_synchronize ()
#elif _MSC_VER >= 1400 /* VC++ 2005 */

5
python-gevent.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 12 08:47:18 UTC 2014 - schwab@suse.de
- libev.patch: fix syntax error in preprocessor conditional
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 15 15:01:04 UTC 2013 - p.drouand@gmail.com Sun Dec 15 15:01:04 UTC 2013 - p.drouand@gmail.com

5
python-gevent.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-gevent # spec file for package python-gevent
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -24,6 +24,8 @@ Summary: Python network library that uses greenlet and libevent
License: MIT License: MIT
Group: Development/Languages/Python Group: Development/Languages/Python
Source: http://pypi.python.org/packages/source/g/gevent/gevent-%{version}.tar.gz Source: http://pypi.python.org/packages/source/g/gevent/gevent-%{version}.tar.gz
# PATCH-FIX-UPSTREAM fix syntax error in preprocessor conditional (github issue 361)
Patch: libev.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libevent-devel BuildRequires: libevent-devel
#BuildRequires: python-Sphinx #BuildRequires: python-Sphinx
@ -54,6 +56,7 @@ out the list of the open source projects based on gevent.
%prep %prep
%setup -q -n gevent-%{version} %setup -q -n gevent-%{version}
%patch -p1
%build %build
CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build