mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: Boost: Fix a bug that breaks libetonyek.
This fixes <https://issues.guix.gnu.org/72040>. * gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Use it. (boost-for-source-highlight): New variable, not using the patch. * gnu/packages/pretty-print.scm (source-highlight)[inputs]: Replace BOOST with BOOST-FOR-SOURCE-HIGHLIGHT. Change-Id: I5fbc9eb5000aefd7d3a14cc7a0482741032b5400
This commit is contained in:
parent
1c322552dd
commit
8a20f58420
4 changed files with 63 additions and 4 deletions
|
@ -0,0 +1,38 @@
|
|||
Fix the build of libetonyek / libreoffice:
|
||||
|
||||
https://issues.guix.gnu.org/72040
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
|
||||
https://github.com/boostorg/phoenix/commit/8913607a3788cb82d48ed461ea59c919b7bad3df
|
||||
|
||||
From 8913607a3788cb82d48ed461ea59c919b7bad3df Mon Sep 17 00:00:00 2001
|
||||
From: djowel <djowel@gmail.com>
|
||||
Date: Tue, 29 Aug 2023 14:32:41 +0800
|
||||
Subject: [PATCH] Disabled this for now, due to ODR violations $$$ Fix Me $$$
|
||||
|
||||
---
|
||||
include/boost/phoenix/stl/tuple.hpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/boost/phoenix/stl/tuple.hpp b/include/boost/phoenix/stl/tuple.hpp
|
||||
index fb9440d2..a2e42bec 100644
|
||||
--- a/include/boost/phoenix/stl/tuple.hpp
|
||||
+++ b/include/boost/phoenix/stl/tuple.hpp
|
||||
@@ -106,6 +106,7 @@ namespace boost { namespace phoenix {
|
||||
tuple_detail::idx_wrap<N>(), t);
|
||||
}
|
||||
|
||||
+#if 0 // Disabled this for now due to ODR viaolations $$$ Fix Me $$$
|
||||
// Make unpacked argument placeholders
|
||||
namespace placeholders {
|
||||
#define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
|
||||
@@ -114,6 +115,8 @@ namespace boost { namespace phoenix {
|
||||
boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
|
||||
#include BOOST_PP_LOCAL_ITERATE()
|
||||
}
|
||||
+#endif
|
||||
+
|
||||
}} // namespace boost::phoenix
|
||||
|
||||
#endif // C++ 14
|
Loading…
Add table
Add a link
Reference in a new issue