From 92ed389917d528a34410519b31d7e2c9857f1700 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 1 Mar 2016 14:16:29 +0100 Subject: [PATCH] Used updated upstream fix for GCC 6 issue --- swig.spec | 20 +++++++++++-------- ...8-Python-Use-std-isfinite-under-C-11.patch | 15 ++++++++++++++ swig308-Update-test-for-macro-isfinite.patch | 12 ----------- 3 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 swig308-Python-Use-std-isfinite-under-C-11.patch delete mode 100644 swig308-Update-test-for-macro-isfinite.patch diff --git a/swig.spec b/swig.spec index fc1248e..0795192 100644 --- a/swig.spec +++ b/swig.spec @@ -36,7 +36,7 @@ Summary: Connects C/C++/Objective C to some high-level programming languages Name: swig Version: 3.0.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ and BSD URL: http://swig.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz @@ -51,7 +51,8 @@ Source4: ccache-swig.csh # on these arches Patch0: swig308-Fix-li_boost_array-test.patch Patch1: swig308-Do-not-use-isystem.patch -Patch2: swig308-Update-test-for-macro-isfinite.patch +Patch2: swig308-Python-Use-std-isfinite-under-C-11.patch + BuildRequires: perl, python2-devel, pcre-devel BuildRequires: autoconf, automake, gawk, dos2unix @@ -267,6 +268,9 @@ install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d %doc Doc Examples COPYRIGHT %changelog +* Tue Mar 01 2016 Jitka Plesnikova - 3.0.8-5 +- Used updated upstream fix for GCC 6 issue + * Mon Feb 22 2016 Jitka Plesnikova - 3.0.8-4 - Patched to build against GCC 6 - Disable Go tests, because they failed against new Go 1.6 @@ -626,12 +630,12 @@ install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d - swig can determine architecture now (#211095) * Mon Aug 28 2006 Jitka Kudrnacova -1.3.29-1 --rebuilt +-rebuilt * Tue Jul 18 2006 Jitka Kudrnacova - 1.3.29-0.3 -- rebuilt +- rebuilt -* Fri Jun 30 2006 Jitka Kudrnacova - 1.3.29-0.2 +* Fri Jun 30 2006 Jitka Kudrnacova - 1.3.29-0.2 - Build requires autoconf, automake (bug #197132) * Wed Apr 19 2006 Jitka Kudrnacova - 1.3.29-0.1 @@ -652,13 +656,13 @@ install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d * Wed Mar 02 2005 Phil Knirsch 1.3.24-2 - bump release and rebuild with gcc 4 -* Thu Feb 03 2005 Karsten Hopp 1.3.24-1 +* Thu Feb 03 2005 Karsten Hopp 1.3.24-1 - update * Wed Dec 01 2004 Phil Knirsch 1.3.23-2 - rebuild -* Tue Nov 23 2004 Karsten Hopp 1.3.23-1 +* Tue Nov 23 2004 Karsten Hopp 1.3.23-1 - update - new pylib patch - remove destdir patch, swig.m4 is no longer included @@ -771,7 +775,7 @@ install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d - rebuilt for 6.1 * Thu Apr 15 1999 Michael Maher -- built package for 6.0 +- built package for 6.0 * Tue Sep 15 1998 Michael Maher - built package diff --git a/swig308-Python-Use-std-isfinite-under-C-11.patch b/swig308-Python-Use-std-isfinite-under-C-11.patch new file mode 100644 index 0000000..a2b3695 --- /dev/null +++ b/swig308-Python-Use-std-isfinite-under-C-11.patch @@ -0,0 +1,15 @@ +diff -up swig-3.0.8/Lib/typemaps/fragments.swg.orig swig-3.0.8/Lib/typemaps/fragments.swg +--- swig-3.0.8/Lib/typemaps/fragments.swg.orig 2015-12-30 23:23:47.000000000 +0100 ++++ swig-3.0.8/Lib/typemaps/fragments.swg 2016-03-01 10:13:29.840682167 +0100 +@@ -168,8 +168,11 @@ + %fragment("SWIG_isfinite","header",fragment=",") %{ + /* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */ + #ifndef SWIG_isfinite ++/* isfinite() is a macro for C99, but a function in namespace std for C++11. */ + # if defined(isfinite) + # define SWIG_isfinite(X) (isfinite(X)) ++# elif defined __cplusplus && __cplusplus >= 201103L ++# define SWIG_isfinite(X) (std::isfinite(X)) + # elif defined(_MSC_VER) + # define SWIG_isfinite(X) (_finite(X)) + # elif defined(__sun) && defined(__SVR4) diff --git a/swig308-Update-test-for-macro-isfinite.patch b/swig308-Update-test-for-macro-isfinite.patch deleted file mode 100644 index b603d05..0000000 --- a/swig308-Update-test-for-macro-isfinite.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up swig-3.0.8/Lib/typemaps/fragments.swg.orig swig-3.0.8/Lib/typemaps/fragments.swg ---- swig-3.0.8/Lib/typemaps/fragments.swg.orig 2016-02-18 08:30:57.625989817 +0100 -+++ swig-3.0.8/Lib/typemaps/fragments.swg 2016-02-18 08:31:13.260900411 +0100 -@@ -168,7 +168,7 @@ - %fragment("SWIG_isfinite","header",fragment=",") %{ - /* Getting isfinite working pre C99 across multiple platforms is non-trivial. Users can provide SWIG_isfinite on older platforms. */ - #ifndef SWIG_isfinite --# if defined(isfinite) -+# if defined(isfinite) || (defined __cplusplus && __cplusplus >= 201103L) - # define SWIG_isfinite(X) (isfinite(X)) - # elif defined(_MSC_VER) - # define SWIG_isfinite(X) (_finite(X))