From 01513e795258b9c311326065df11febcfe894aee3ad88e296e9a2217928aa883 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 28 Jan 2016 13:55:20 +0000 Subject: [PATCH] Accepting request 356504 from openSUSE:Factory:Staging:Gcc6 - Add python-Cython-c++11.patch to fix complex math testcase compile with GCC 6 defaulting to C++14. (bnc#963974) OBS-URL: https://build.opensuse.org/request/show/356504 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Cython?expand=0&rev=65 --- python-Cython-c++11.patch | 11 +++++++++++ python-Cython.changes | 6 ++++++ python-Cython.spec | 4 +++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 python-Cython-c++11.patch diff --git a/python-Cython-c++11.patch b/python-Cython-c++11.patch new file mode 100644 index 0000000..42f61da --- /dev/null +++ b/python-Cython-c++11.patch @@ -0,0 +1,11 @@ +--- Cython/Compiler/PyrexTypes.py.orig 2016-01-28 12:06:29.060198431 +0000 ++++ Cython/Compiler/PyrexTypes.py 2016-01-28 12:07:24.296842892 +0000 +@@ -1930,7 +1930,7 @@ + #define __Pyx_CIMAG(z) ((z).imag) + #endif + +-#if (defined(_WIN32) || defined(__clang__)) && defined(__cplusplus) && CYTHON_CCOMPLEX ++#if defined(__cplusplus) && (defined(_WIN32) || defined(__clang__) || __cplusplus >= 201103L) && CYTHON_CCOMPLEX + #define __Pyx_SET_CREAL(z,x) ((z).real(x)) + #define __Pyx_SET_CIMAG(z,y) ((z).imag(y)) + #else diff --git a/python-Cython.changes b/python-Cython.changes index befca02..d9b8bf9 100644 --- a/python-Cython.changes +++ b/python-Cython.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 28 12:09:56 UTC 2016 - rguenther@suse.com + +- Add python-Cython-c++11.patch to fix complex math testcase compile + with GCC 6 defaulting to C++14. (bnc#963974) + ------------------------------------------------------------------- Wed Aug 26 17:11:12 UTC 2015 - ted.nokonechny@uregina.ca diff --git a/python-Cython.spec b/python-Cython.spec index 343a791..e5b856d 100644 --- a/python-Cython.spec +++ b/python-Cython.spec @@ -1,7 +1,7 @@ # # spec file for package python-Cython # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ License: Apache-2.0 Group: Development/Languages/Python Source: http://cython.org/release/Cython-%{version}.tar.gz Source1: python-Cython-rpmlintrc +Patch1: python-Cython-c++11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: gcc-c++ @@ -57,6 +58,7 @@ code. %prep %setup -q -n Cython-%{version} +%patch1 # Fix non-executable scripts sed -i "s|^#!.*||" Cython/Debugger/{libpython,Cygdb}.py cython.py # Fix EOL encoding