| 1 |
commit: e27754fd8b411c54786f4eeec67283913e38b991 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 4 06:43:23 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 4 06:44:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e27754fd |
| 7 |
|
| 8 |
www-apache/passenger: bug#580078 isnan compile fix. |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=580078 |
| 11 |
Package-Manager: portage-2.3.2 |
| 12 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 13 |
|
| 14 |
www-apache/passenger/files/passenger-5.1.1-isnan.patch | 14 ++++++++++++++ |
| 15 |
www-apache/passenger/passenger-5.0.30.ebuild | 1 + |
| 16 |
www-apache/passenger/passenger-5.1.0.ebuild | 3 ++- |
| 17 |
www-apache/passenger/passenger-5.1.1.ebuild | 1 + |
| 18 |
www-apache/passenger/passenger-5.1.2.ebuild | 1 + |
| 19 |
5 files changed, 19 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/www-apache/passenger/files/passenger-5.1.1-isnan.patch b/www-apache/passenger/files/passenger-5.1.1-isnan.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000..02f7fe7 |
| 24 |
--- /dev/null |
| 25 |
+++ b/www-apache/passenger/files/passenger-5.1.1-isnan.patch |
| 26 |
@@ -0,0 +1,14 @@ |
| 27 |
+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 |
| 28 |
+--- passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp 2013-10-26 15:00:00.000000000 -0700 |
| 29 |
++++ passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp 2017-01-12 19:21:39.696285758 -0800 |
| 30 |
+@@ -134,8 +134,8 @@ |
| 31 |
+ inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnanq(f); } |
| 32 |
+ inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnanq(f); } |
| 33 |
+ #else |
| 34 |
+-inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnan(static_cast<double>(f)); } |
| 35 |
+-inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnan(static_cast<double>(f)); } |
| 36 |
++inline bool is_nan_helper(__float128 f, const boost::true_type&) { return std::isnan(static_cast<double>(f)); } |
| 37 |
++inline bool is_nan_helper(__float128 f, const boost::false_type&) { return std::isnan(static_cast<double>(f)); } |
| 38 |
+ #endif |
| 39 |
+ #endif |
| 40 |
+ } |
| 41 |
|
| 42 |
diff --git a/www-apache/passenger/passenger-5.0.30.ebuild b/www-apache/passenger/passenger-5.0.30.ebuild |
| 43 |
index f40d4a1..c78c963 100644 |
| 44 |
--- a/www-apache/passenger/passenger-5.0.30.ebuild |
| 45 |
+++ b/www-apache/passenger/passenger-5.0.30.ebuild |
| 46 |
@@ -43,6 +43,7 @@ pkg_setup() { |
| 47 |
|
| 48 |
all_ruby_prepare() { |
| 49 |
epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
| 50 |
+ epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
| 51 |
|
| 52 |
# Change these with sed instead of a patch so that we can easily use |
| 53 |
# the toolchain-funcs methods. |
| 54 |
|
| 55 |
diff --git a/www-apache/passenger/passenger-5.1.0.ebuild b/www-apache/passenger/passenger-5.1.0.ebuild |
| 56 |
index e230887..ed1c264 100644 |
| 57 |
--- a/www-apache/passenger/passenger-5.1.0.ebuild |
| 58 |
+++ b/www-apache/passenger/passenger-5.1.0.ebuild |
| 59 |
@@ -1,4 +1,4 @@ |
| 60 |
-# Copyright 1999-2016 Gentoo Foundation |
| 61 |
+# Copyright 1999-2017 Gentoo Foundation |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
# $Id$ |
| 64 |
|
| 65 |
@@ -43,6 +43,7 @@ pkg_setup() { |
| 66 |
|
| 67 |
all_ruby_prepare() { |
| 68 |
epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
| 69 |
+ epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
| 70 |
|
| 71 |
# Change these with sed instead of a patch so that we can easily use |
| 72 |
# the toolchain-funcs methods. |
| 73 |
|
| 74 |
diff --git a/www-apache/passenger/passenger-5.1.1.ebuild b/www-apache/passenger/passenger-5.1.1.ebuild |
| 75 |
index 4d3390b..ed1c264 100644 |
| 76 |
--- a/www-apache/passenger/passenger-5.1.1.ebuild |
| 77 |
+++ b/www-apache/passenger/passenger-5.1.1.ebuild |
| 78 |
@@ -43,6 +43,7 @@ pkg_setup() { |
| 79 |
|
| 80 |
all_ruby_prepare() { |
| 81 |
epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
| 82 |
+ epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
| 83 |
|
| 84 |
# Change these with sed instead of a patch so that we can easily use |
| 85 |
# the toolchain-funcs methods. |
| 86 |
|
| 87 |
diff --git a/www-apache/passenger/passenger-5.1.2.ebuild b/www-apache/passenger/passenger-5.1.2.ebuild |
| 88 |
index 12ff286..07eca2f 100644 |
| 89 |
--- a/www-apache/passenger/passenger-5.1.2.ebuild |
| 90 |
+++ b/www-apache/passenger/passenger-5.1.2.ebuild |
| 91 |
@@ -43,6 +43,7 @@ pkg_setup() { |
| 92 |
|
| 93 |
all_ruby_prepare() { |
| 94 |
epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch |
| 95 |
+ epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch |
| 96 |
|
| 97 |
# Change these with sed instead of a patch so that we can easily use |
| 98 |
# the toolchain-funcs methods. |
Archives