commit:     e27754fd8b411c54786f4eeec67283913e38b991
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 06:43:23 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 06:44:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e27754fd

www-apache/passenger: bug#580078 isnan compile fix.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=580078
Package-Manager: portage-2.3.2
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 www-apache/passenger/files/passenger-5.1.1-isnan.patch | 14 ++++++++++++++
 www-apache/passenger/passenger-5.0.30.ebuild           |  1 +
 www-apache/passenger/passenger-5.1.0.ebuild            |  3 ++-
 www-apache/passenger/passenger-5.1.1.ebuild            |  1 +
 www-apache/passenger/passenger-5.1.2.ebuild            |  1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/www-apache/passenger/files/passenger-5.1.1-isnan.patch 
b/www-apache/passenger/files/passenger-5.1.1-isnan.patch
new file mode 100644
index 00000000..02f7fe7
--- /dev/null
+++ b/www-apache/passenger/files/passenger-5.1.1-isnan.patch
@@ -0,0 +1,14 @@
+diff -uNr 
passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp
 
passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp
+--- 
passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp
        2013-10-26 15:00:00.000000000 -0700
++++ 
passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp
     2017-01-12 19:21:39.696285758 -0800
+@@ -134,8 +134,8 @@
+ inline bool is_nan_helper(__float128 f, const boost::true_type&) { return 
::isnanq(f); }
+ inline bool is_nan_helper(__float128 f, const boost::false_type&) { return 
::isnanq(f); }
+ #else
+-inline bool is_nan_helper(__float128 f, const boost::true_type&) { return 
::isnan(static_cast<double>(f)); }
+-inline bool is_nan_helper(__float128 f, const boost::false_type&) { return 
::isnan(static_cast<double>(f)); }
++inline bool is_nan_helper(__float128 f, const boost::true_type&) { return 
std::isnan(static_cast<double>(f)); }
++inline bool is_nan_helper(__float128 f, const boost::false_type&) { return 
std::isnan(static_cast<double>(f)); }
+ #endif
+ #endif
+ }

diff --git a/www-apache/passenger/passenger-5.0.30.ebuild 
b/www-apache/passenger/passenger-5.0.30.ebuild
index f40d4a1..c78c963 100644
--- a/www-apache/passenger/passenger-5.0.30.ebuild
+++ b/www-apache/passenger/passenger-5.0.30.ebuild
@@ -43,6 +43,7 @@ pkg_setup() {
 
 all_ruby_prepare() {
        epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+       epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
 
        # Change these with sed instead of a patch so that we can easily use
        # the toolchain-funcs methods.

diff --git a/www-apache/passenger/passenger-5.1.0.ebuild 
b/www-apache/passenger/passenger-5.1.0.ebuild
index e230887..ed1c264 100644
--- a/www-apache/passenger/passenger-5.1.0.ebuild
+++ b/www-apache/passenger/passenger-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -43,6 +43,7 @@ pkg_setup() {
 
 all_ruby_prepare() {
        epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+       epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
 
        # Change these with sed instead of a patch so that we can easily use
        # the toolchain-funcs methods.

diff --git a/www-apache/passenger/passenger-5.1.1.ebuild 
b/www-apache/passenger/passenger-5.1.1.ebuild
index 4d3390b..ed1c264 100644
--- a/www-apache/passenger/passenger-5.1.1.ebuild
+++ b/www-apache/passenger/passenger-5.1.1.ebuild
@@ -43,6 +43,7 @@ pkg_setup() {
 
 all_ruby_prepare() {
        epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+       epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
 
        # Change these with sed instead of a patch so that we can easily use
        # the toolchain-funcs methods.

diff --git a/www-apache/passenger/passenger-5.1.2.ebuild 
b/www-apache/passenger/passenger-5.1.2.ebuild
index 12ff286..07eca2f 100644
--- a/www-apache/passenger/passenger-5.1.2.ebuild
+++ b/www-apache/passenger/passenger-5.1.2.ebuild
@@ -43,6 +43,7 @@ pkg_setup() {
 
 all_ruby_prepare() {
        epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+       epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
 
        # Change these with sed instead of a patch so that we can easily use
        # the toolchain-funcs methods.

Reply via email to