pool/boost
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1061818 from devel:libraries:c_c++

Browse Source 
- add boost-phoenix-revert-std-tuple-support.patch to fix
  libetonyek and others build that use boost::phoenix 

- update to 1.81.0
  * new libraries:
    + URL - URL Library
  * for details on all changes see,
    https://www.boost.org/users/history/version_1_81_0.html

- switch to pkgconfig(zlib) so that alternative providers can be
  used

OBS-URL: https://build.opensuse.org/request/show/1061818
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=159
This commit is contained in:
Dominique Leuenberger 2023-01-31 15:08:02 +00:00 committed by Git OBS Bridge
commit 698be1564e
6 changed files with 120 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
baselibs.conf
View File

@ -1,26 +1,27 @@
libboost_atomic1_80_0
libboost_container1_80_0
libboost_context1_80_0
libboost_coroutine1_80_0
libboost_date_time1_80_0
libboost_fiber1_80_0
libboost_filesystem1_80_0
libboost_graph1_80_0
libboost_graph_parallel1_80_0
libboost_iostreams1_80_0
libboost_locale1_80_0
libboost_math1_80_0
libboost_mpi1_80_0
libboost_nowide1_80_0
libboost_test1_80_0
libboost_program_options1_80_0
libboost_python-py3-1_80_0
libboost_random1_80_0
libboost_serialization1_80_0
libboost_stacktrace1_80_0
libboost_system1_80_0
libboost_thread1_80_0
libboost_type_erasure1_80_0
libboost_wave1_80_0
libboost_regex1_80_0
libboost_json1_80_0
libboost_atomic1_81_0
libboost_container1_81_0
libboost_context1_81_0
libboost_coroutine1_81_0
libboost_date_time1_81_0
libboost_fiber1_81_0
libboost_filesystem1_81_0
libboost_graph1_81_0
libboost_graph_parallel1_81_0
libboost_iostreams1_81_0
libboost_locale1_81_0
libboost_math1_81_0
libboost_mpi1_81_0
libboost_nowide1_81_0
libboost_test1_81_0
libboost_program_options1_81_0
libboost_python-py3-1_81_0
libboost_random1_81_0
libboost_serialization1_81_0
libboost_stacktrace1_81_0
libboost_system1_81_0
libboost_thread1_81_0
libboost_type_erasure1_81_0
libboost_wave1_81_0
libboost_url1_81_0
libboost_regex1_81_0
libboost_json1_81_0

31
boost-phoenix-revert-std-tuple-support.patch Normal file
View File

@ -0,0 +1,31 @@
From cc9bc2387fe19d6cb130460defe52ee8ecefe968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Nov 2022 07:34:17 +0700
Subject: [PATCH] stl/tuple: change uarg##N to internal linkage
8b6a9c2 (std::tuple support (Resolving #103) (#104), 2021-03-11) put
uarg##N in all translation units, which includes
boost/phoenix/stl/tuple.hpp or boost/phoenix/stl.hpp, with external
linkage. Thus, we'll run into below error:
> multiple definition of `boost::phoenix::placeholders::uarg1'
Change it to internal linkage.
---
include/boost/phoenix/stl/tuple.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/boost/phoenix/stl/tuple.hpp b/include/boost/phoenix/stl/tuple.hpp
index a83014ac..d04ad16e 100644
--- a/boost/phoenix/stl/tuple.hpp
+++ b/boost/phoenix/stl/tuple.hpp
@@ -110,7 +110,7 @@ namespace boost { namespace phoenix {
namespace placeholders {
#define BOOST_PP_LOCAL_LIMITS (1, BOOST_PHOENIX_ARG_LIMIT)
#define BOOST_PP_LOCAL_MACRO(N) \
- auto uarg##N = \
+ const auto uarg##N = \
boost::phoenix::get_<(N)-1>(boost::phoenix::placeholders::arg1);
#include BOOST_PP_LOCAL_ITERATE()
}

23
boost.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Jan 28 22:01:20 UTC 2023 - Dirk Müller <dmueller@suse.com>
- add boost-phoenix-revert-std-tuple-support.patch to fix
libetonyek and others build that use boost::phoenix
-------------------------------------------------------------------
Wed Dec 14 18:00:01 CET 2022 - Arvin Schnell <aschnell@suse.com>
- update to 1.81.0
* new libraries:
+ URL - URL Library
* for details on all changes see,
https://www.boost.org/users/history/version_1_81_0.html
-------------------------------------------------------------------
Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
- switch to pkgconfig(zlib) so that alternative providers can be
used
-------------------------------------------------------------------
Mon Aug 22 14:19:58 UTC 2022 - Adam Majer <adam.majer@suse.de>
@ -35,7 +56,7 @@ Fri Mar 11 15:11:05 CET 2022 - aschnell@suse.com
- add dependency on libzstd and libzstd-devel to get on-the-fly
zstd compression in boost-iostreams
-------------------------------------------------------------------
Tue Dec 21 09:08:17 CET 2021 - aschnell@suse.com

44
boost.spec
View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,9 +19,9 @@
#
%global flavor @BUILD_FLAVOR@%{nil}
%define ver 1.80.0
%define _ver 1_80_0
%define package_version 1_80_0
%define ver 1.81.0
%define _ver 1_81_0
%define package_version 1_81_0
%define file_version %_ver
%define lib_appendix %_ver
%define docs_version 1.56.0
@ -235,9 +235,9 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
%endif
Name: %{base_name}
Version: 1.80.0
Version: 1.81.0
Release: 0
%define library_version 1_80_0
%define library_version 1_81_0
Summary: Boost C++ Libraries
License: BSL-1.0
Group: Development/Libraries/C and C++
@ -253,6 +253,8 @@ Source101: symbol_diff.sh
Source102: README.boost-devel
Patch1: boost-thread.patch
Patch2: boost-no_type_punning.patch
# https://github.com/boostorg/phoenix/pull/112
Patch3: boost-phoenix-revert-std-tuple-support.patch
Patch4: boost-pool_check_overflow.patch
Patch5: boost-strict_aliasing.patch
Patch6: boost-use_std_xml_catalog.patch
@ -272,7 +274,7 @@ BuildRequires: libexpat-devel
BuildRequires: libicu-devel
BuildRequires: libzstd-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(zlib)
%if %{with boost_fiber}
BuildRequires: gcc-c++ > 5
%else
@ -372,6 +374,7 @@ Requires: libboost_test%{library_version}-devel
Requires: libboost_thread%{library_version}-devel
Requires: libboost_timer%{library_version}-devel
Requires: libboost_type_erasure%{library_version}-devel
Requires: libboost_url%{library_version}-devel
Requires: libboost_wave%{library_version}-devel
Requires: libstdc++-devel
Conflicts: boost-devel-impl
@ -1065,6 +1068,22 @@ Provides: libboost_wave-devel-impl = %{version}
%description -n libboost_wave%{library_version}-devel
This package contains development headers for Boost.Wave library.
%package -n libboost_url%{library_version}
Summary: Boost.URL runtime library
Group: System/Libraries
Requires: boost-license%{library_version}
%description -n libboost_url%{library_version}
This package contains the Boost::URL runtime library.
%package -n libboost_url%{library_version}-devel
Summary: Development headers for Boost.URL library
Group: Development/Libraries/C and C++
Provides: libboost_url-devel-impl = %{version}
%description -n libboost_url%{library_version}-devel
This package contains development headers for Boost.URL library.
%package -n libboost_regex%{library_version}
Summary: Boost.Regex runtime library
Group: System/Libraries
@ -1246,6 +1265,7 @@ tasks.
find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} +
%patch1 -p1
%patch2
%patch3 -p1
%patch4
%patch5
%patch6 -p1
@ -1613,6 +1633,7 @@ EOF
%post -n libboost_stacktrace%{library_version} -p /sbin/ldconfig
%post -n libboost_system%{library_version} -p /sbin/ldconfig
%post -n libboost_wave%{library_version} -p /sbin/ldconfig
%post -n libboost_url%{library_version} -p /sbin/ldconfig
%post -n libboost_random%{library_version} -p /sbin/ldconfig
%post -n libboost_chrono%{library_version} -p /sbin/ldconfig
%post -n libboost_locale%{library_version} -p /sbin/ldconfig
@ -1664,6 +1685,7 @@ EOF
%postun -n libboost_stacktrace%{library_version} -p /sbin/ldconfig
%postun -n libboost_system%{library_version} -p /sbin/ldconfig
%postun -n libboost_wave%{library_version} -p /sbin/ldconfig
%postun -n libboost_url%{library_version} -p /sbin/ldconfig
%postun -n libboost_random%{library_version} -p /sbin/ldconfig
%postun -n libboost_chrono%{library_version} -p /sbin/ldconfig
%postun -n libboost_locale%{library_version} -p /sbin/ldconfig
@ -1997,6 +2019,14 @@ EOF
%{package_libdir}/cmake/boost_wave-%{version}/*
%{package_libdir}/libboost_wave.so
%files -n libboost_url%{library_version}
%{package_libdir}/libboost_url.so.%{version}
%files -n libboost_url%{library_version}-devel
%dir %{package_libdir}/cmake/boost_url-%{version}
%{package_libdir}/cmake/boost_url-%{version}/*
%{package_libdir}/libboost_url.so
%files -n libboost_regex%{library_version}
%{package_libdir}/libboost_regex.so.%{version}

3
boost_1_80_0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
size 115869904

3
boost_1_81_0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa
size 118797750