| 1 |
commit: 42a9bc145ce5188ad3852261c912314960581665 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jul 25 03:00:32 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 25 21:52:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a9bc14 |
| 7 |
|
| 8 |
dev-libs/msgpack: fix building with GCC-6. |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/623492 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/5206 |
| 14 |
|
| 15 |
dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch | 22 ++++++++++++++++++++++ |
| 16 |
dev-libs/msgpack/msgpack-1.1.0.ebuild | 6 +++++- |
| 17 |
2 files changed, 27 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..2fc9bb46e4b |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch |
| 24 |
@@ -0,0 +1,22 @@ |
| 25 |
+Bug: https://bugs.gentoo.org/623492 |
| 26 |
+Backported from: https://github.com/msgpack/msgpack-c/commit/66a5fcf8f1a9e57b02904a6ac55a86a9c74ea1de |
| 27 |
+ |
| 28 |
+--- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp |
| 29 |
++++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp |
| 30 |
+@@ -46,13 +46,14 @@ |
| 31 |
+ public: |
| 32 |
+ using base = std::tuple<Types...>; |
| 33 |
+ |
| 34 |
+- using base::base; |
| 35 |
+ |
| 36 |
+- tuple() = default; |
| 37 |
+ tuple(tuple const&) = default; |
| 38 |
+ tuple(tuple&&) = default; |
| 39 |
+ |
| 40 |
+ template<typename... OtherTypes> |
| 41 |
++ tuple(OtherTypes&&... other):base(std::forward<OtherTypes>(other)...) {} |
| 42 |
++ |
| 43 |
++ template<typename... OtherTypes> |
| 44 |
+ tuple(tuple<OtherTypes...> const& other):base(static_cast<std::tuple<OtherTypes...> const&>(other)) {} |
| 45 |
+ template<typename... OtherTypes> |
| 46 |
+ tuple(tuple<OtherTypes...> && other):base(static_cast<std::tuple<OtherTypes...> &&>(other)) {} |
| 47 |
|
| 48 |
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild |
| 49 |
index e9316807c0c..0743ad515c8 100644 |
| 50 |
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild |
| 51 |
+++ b/dev-libs/msgpack/msgpack-1.1.0.ebuild |
| 52 |
@@ -1,7 +1,8 @@ |
| 53 |
-# Copyright 1999-2015 Gentoo Foundation |
| 54 |
+# Copyright 1999-2017 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
EAPI=5 |
| 58 |
+ |
| 59 |
inherit cmake-multilib |
| 60 |
|
| 61 |
if [[ ${PV} == 9999 ]]; then |
| 62 |
@@ -27,9 +28,11 @@ DEPEND=" |
| 63 |
" |
| 64 |
|
| 65 |
DOCS=( README.md ) |
| 66 |
+ |
| 67 |
PATCHES=( |
| 68 |
"${FILESDIR}"/${PN}-1.0.0-cflags.patch |
| 69 |
"${FILESDIR}"/${PN}-1.0.0-static.patch |
| 70 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 71 |
) |
| 72 |
|
| 73 |
src_configure() { |
| 74 |
@@ -38,5 +41,6 @@ src_configure() { |
| 75 |
$(cmake-utils_use static-libs MSGPACK_STATIC) |
| 76 |
$(cmake-utils_use test MSGPACK_BUILD_TESTS) |
| 77 |
) |
| 78 |
+ |
| 79 |
cmake-multilib_src_configure |
| 80 |
} |
Archives