Skip to content

Commit 0fcce55

Browse files
authored
Fixes boost by adding phoenix multiple defn patch needed by libetonyek (#13608)
1 parent d73da20 commit 0fcce55

2 files changed

Lines changed: 30 additions & 2 deletions

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- boost_1_81_0/boost/phoenix/stl/tuple.hpp~ 2023-03-15 09:31:59.327721489 +0000
2+
+++ boost_1_81_0/boost/phoenix/stl/tuple.hpp 2023-03-15 09:32:02.787722445 +0000
3+
@@ -106,14 +106,16 @@
4+
tuple_detail::idx_wrap<N>(), t);
5+
}
6+
7+
+#ifndef BOOST_PHOENIX_NO_PREDEFINED_TERMINALS
8+
// Make unpacked argument placeholders
9+
namespace placeholders {
10+
#define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
11+
#define BOOST_PP_LOCAL_MACRO(N) \
12+
- auto uarg##N = \
13+
+ const auto uarg##N = \
14+
boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
15+
#include BOOST_PP_LOCAL_ITERATE()
16+
}
17+
+#endif
18+
}} // namespace boost::phoenix
19+
20+
#endif // C++ 14

SPECS/boost/boost.spec

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: Boost
33
Name: boost
44
Version: 1.83.0
5-
Release: 1%{?dist}
5+
Release: 2%{?dist}
66
License: Boost
77
Vendor: Microsoft Corporation
88
Distribution: Azure Linux
@@ -12,6 +12,11 @@ Source0: https://downloads.sourceforge.net/boost/%{name}_%{underscore_ver
1212
BuildRequires: bzip2-devel
1313
BuildRequires: libbacktrace-static
1414

15+
# https://bugzilla.redhat.com/show_bug.cgi?id=2178210
16+
# https://github.com/boostorg/phoenix/issues/111
17+
# https://github.com/boostorg/phoenix/issues/115
18+
Patch0: boost-1.81-phoenix-multiple-defn.patch
19+
1520
%global sonamever %{version}
1621

1722
%description
@@ -67,7 +72,7 @@ developers to obtain (name, value) pairs from the user, via
6772
conventional methods such as command-line and configuration file.
6873

6974
%prep
70-
%autosetup -n %{name}_%{underscore_version}
75+
%autosetup -n %{name}_%{underscore_version} -p1
7176

7277
%build
7378
./bootstrap.sh --prefix=%{buildroot}%{_prefix}
@@ -110,6 +115,9 @@ rm -rf %{buildroot}%{_libdir}/cmake
110115
%{_libdir}/libboost_system.so.%{sonamever}
111116

112117
%changelog
118+
* Mon Apr 28 2025 Aninda Pradhan <v-anipradhan@microsoft.com> - 1.83.0-2
119+
- Adds boost-1.81-phoenix-multiple-defn.patch
120+
113121
* Wed Mar 13 2024 Himaja Kesari <himajakesari@microsoft.com>
114122
- Add filesystem, random, system, program-options packages
115123

0 commit comments

Comments
 (0)