| 1 |
commit: 5688163ca8cafad73827308c2efdda56e4985714 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 23 16:16:38 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 23 16:17:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5688163c |
| 7 |
|
| 8 |
dev-libs/boost: backport math header fix |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/808087 |
| 11 |
Closes: https://bugs.gentoo.org/808663 |
| 12 |
Closes: https://bugs.gentoo.org/808677 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
...{boost-1.77.0.ebuild => boost-1.77.0-r1.ebuild} | 1 + |
| 16 |
.../files/boost-1.77-math-deprecated-include.patch | 40 ++++++++++++++++++++++ |
| 17 |
2 files changed, 41 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-libs/boost/boost-1.77.0.ebuild b/dev-libs/boost/boost-1.77.0-r1.ebuild |
| 20 |
similarity index 99% |
| 21 |
rename from dev-libs/boost/boost-1.77.0.ebuild |
| 22 |
rename to dev-libs/boost/boost-1.77.0-r1.ebuild |
| 23 |
index 40748904301..9a715e08895 100644 |
| 24 |
--- a/dev-libs/boost/boost-1.77.0.ebuild |
| 25 |
+++ b/dev-libs/boost/boost-1.77.0-r1.ebuild |
| 26 |
@@ -53,6 +53,7 @@ PATCHES=( |
| 27 |
"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch |
| 28 |
"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch |
| 29 |
"${FILESDIR}"/${PN}-1.76-sparc-define.patch |
| 30 |
+ "${FILESDIR}"/${PN}-1.77-math-deprecated-include.patch |
| 31 |
) |
| 32 |
|
| 33 |
python_bindings_needed() { |
| 34 |
|
| 35 |
diff --git a/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch b/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch |
| 36 |
new file mode 100644 |
| 37 |
index 00000000000..44943243eaa |
| 38 |
--- /dev/null |
| 39 |
+++ b/dev-libs/boost/files/boost-1.77-math-deprecated-include.patch |
| 40 |
@@ -0,0 +1,40 @@ |
| 41 |
+https://github.com/boostorg/math/commit/720536a08e4e33639869e1b7a99d9ec923409c0b |
| 42 |
+https://github.com/boostorg/math/issues/675 |
| 43 |
+https://github.com/boostorg/math/pull/676 |
| 44 |
+ |
| 45 |
+From 720536a08e4e33639869e1b7a99d9ec923409c0b Mon Sep 17 00:00:00 2001 |
| 46 |
+From: Matt Borland <matt@×××××××××××.com> |
| 47 |
+Date: Mon, 23 Aug 2021 17:48:28 +0300 |
| 48 |
+Subject: [PATCH] Fix for issue 675 (#676) |
| 49 |
+ |
| 50 |
+--- a/boost/math/tools/header_deprecated.hpp |
| 51 |
++++ a/boost/math/tools/header_deprecated.hpp |
| 52 |
+@@ -6,12 +6,22 @@ |
| 53 |
+ #ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED |
| 54 |
+ #define BOOST_MATH_TOOLS_HEADER_DEPRECATED |
| 55 |
+ |
| 56 |
+-#ifdef _MSC_VER |
| 57 |
+-// Expands to "This header is deprecated; use expr instead." |
| 58 |
+-#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.") |
| 59 |
+-#else // GNU, Clang, Intel, IBM, etc. |
| 60 |
++#ifndef BOOST_MATH_STANDALONE |
| 61 |
++ |
| 62 |
++# include <boost/config/header_deprecated.hpp> |
| 63 |
++# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr) |
| 64 |
++ |
| 65 |
++#else |
| 66 |
++ |
| 67 |
++# ifdef _MSC_VER |
| 68 |
+ // Expands to "This header is deprecated; use expr instead." |
| 69 |
+-#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.") |
| 70 |
+-#endif |
| 71 |
++# define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.") |
| 72 |
++# else // GNU, Clang, Intel, IBM, etc. |
| 73 |
++// Expands to "This header is deprecated use expr instead" |
| 74 |
++# define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr) |
| 75 |
++# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead") |
| 76 |
++# endif |
| 77 |
++ |
| 78 |
++#endif // BOOST_MATH_STANDALONE |
| 79 |
+ |
| 80 |
+ #endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED |
Archives