From 96fda668a8882d44a2cb2f6db9011473073b2662e91ee302b4f6446764a6c02f Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Tue, 23 Apr 2024 12:42:16 +0000 Subject: [PATCH] Accepting request 1169851 from home:aschnell:boost - update to 1.85.0 * new libraries: + charconv (implementation of ) + scope (collection of scope guard utilities) * for details on all changes see, https://www.boost.org/users/history/version_1_85_0.html - dynamic_linking.patch: updated - boost-charconv-quadmath.patch: added OBS-URL: https://build.opensuse.org/request/show/1169851 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=326 --- baselibs.conf | 55 ++++++++++++++++++----------------- boost-charconv-quadmath.patch | 17 +++++++++++ boost.changes | 12 ++++++++ boost.spec | 43 +++++++++++++++++++++++---- boost_1_84_0.tar.bz2 | 3 -- boost_1_85_0.tar.bz2 | 3 ++ dynamic_linking.patch | 15 +++++----- 7 files changed, 105 insertions(+), 43 deletions(-) create mode 100644 boost-charconv-quadmath.patch delete mode 100644 boost_1_84_0.tar.bz2 create mode 100644 boost_1_85_0.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 0540836..f4ec1ee 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,27 +1,28 @@ -libboost_atomic1_84_0 -libboost_container1_84_0 -libboost_context1_84_0 -libboost_coroutine1_84_0 -libboost_date_time1_84_0 -libboost_fiber1_84_0 -libboost_filesystem1_84_0 -libboost_graph1_84_0 -libboost_graph_parallel1_84_0 -libboost_iostreams1_84_0 -libboost_locale1_84_0 -libboost_math1_84_0 -libboost_mpi1_84_0 -libboost_nowide1_84_0 -libboost_test1_84_0 -libboost_program_options1_84_0 -libboost_python-py3-1_84_0 -libboost_random1_84_0 -libboost_serialization1_84_0 -libboost_stacktrace1_84_0 -libboost_system1_84_0 -libboost_thread1_84_0 -libboost_type_erasure1_84_0 -libboost_wave1_84_0 -libboost_url1_84_0 -libboost_regex1_84_0 -libboost_json1_84_0 +libboost_atomic1_85_0 +libboost_container1_85_0 +libboost_context1_85_0 +libboost_coroutine1_85_0 +libboost_date_time1_85_0 +libboost_fiber1_85_0 +libboost_filesystem1_85_0 +libboost_graph1_85_0 +libboost_graph_parallel1_85_0 +libboost_iostreams1_85_0 +libboost_locale1_85_0 +libboost_math1_85_0 +libboost_mpi1_85_0 +libboost_nowide1_85_0 +libboost_test1_85_0 +libboost_program_options1_85_0 +libboost_python-py3-1_85_0 +libboost_random1_85_0 +libboost_serialization1_85_0 +libboost_stacktrace1_85_0 +libboost_system1_85_0 +libboost_thread1_85_0 +libboost_type_erasure1_85_0 +libboost_wave1_85_0 +libboost_url1_85_0 +libboost_regex1_85_0 +libboost_json1_85_0 +libboost_charconv1_85_0 diff --git a/boost-charconv-quadmath.patch b/boost-charconv-quadmath.patch new file mode 100644 index 0000000..9ee447c --- /dev/null +++ b/boost-charconv-quadmath.patch @@ -0,0 +1,17 @@ +The quadmath detection is broken, see https://github.com/boostorg/charconv/issues/191. +Just disable quadmath. + +--- a/boost/charconv/detail/config.hpp 2024-04-23 11:38:55.099806792 +0200 ++++ b/boost/charconv/detail/config.hpp 2024-04-23 11:39:01.966514420 +0200 +@@ -27,11 +27,6 @@ + # define BOOST_CHARCONV_UINT128_MAX (2 * static_cast(BOOST_CHARCONV_INT128_MAX) + 1) + #endif + +-#if defined(BOOST_HAS_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(BOOST_CHARCONV_NO_QUADMATH) +-# define BOOST_CHARCONV_HAS_FLOAT128 +-# include +-#endif +- + #ifndef BOOST_NO_CXX14_CONSTEXPR + # define BOOST_CHARCONV_CXX14_CONSTEXPR BOOST_CXX14_CONSTEXPR + # define BOOST_CHARCONV_CXX14_CONSTEXPR_NO_INLINE BOOST_CXX14_CONSTEXPR diff --git a/boost.changes b/boost.changes index ea325a9..ae6718d 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 23 09:50:52 CEST 2024 - aschnell@suse.com + +- update to 1.85.0 + * new libraries: + + charconv (implementation of ) + + scope (collection of scope guard utilities) + * for details on all changes see, + https://www.boost.org/users/history/version_1_85_0.html +- dynamic_linking.patch: updated +- boost-charconv-quadmath.patch: added + ------------------------------------------------------------------- Wed Mar 20 12:15:08 UTC 2024 - Richard Biener diff --git a/boost.spec b/boost.spec index 23bd4f3..1b9aff3 100644 --- a/boost.spec +++ b/boost.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package boost # # Copyright (c) 2024 SUSE LLC # @@ -19,9 +19,9 @@ # %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.84.0 -%define _ver 1_84_0 -%define package_version 1_84_0 +%define ver 1.85.0 +%define _ver 1_85_0 +%define package_version 1_85_0 %define file_version %_ver %define lib_appendix %_ver %define docs_version 1.56.0 @@ -213,9 +213,9 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le %endif Name: %{base_name} -Version: 1.84.0 +Version: 1.85.0 Release: 0 -%define library_version 1_84_0 +%define library_version 1_85_0 Summary: Boost C++ Libraries License: BSL-1.0 Group: Development/Libraries/C and C++ @@ -243,6 +243,7 @@ Patch18: dynamic_linking.patch Patch20: python_library_name.patch Patch21: boost-remove-cmakedir.patch Patch22: boost-process.patch +Patch23: boost-charconv-quadmath.patch %{?suse_build_hwcaps_libs} BuildRequires: fdupes BuildRequires: gcc-c++ @@ -1212,6 +1213,25 @@ Provides: libboost_json-devel-impl = %{version} %description -n libboost_json%{library_version}-devel This package contains development headers for Boost.JSON library. +%package -n libboost_charconv%{library_version} +Summary: Boost.CharConv runtime library +Group: System/Libraries +Requires: boost-license%{library_version} + +%description -n libboost_charconv%{library_version} +This package contains Boost::CharConv runtime library. + +%package -n libboost_charconv%{library_version}-devel +Summary: Development headers for Boost.CharConv library +Group: Development/Libraries/C and C++ +Requires: libboost_charconv%{library_version} = %{version} +Requires: libboost_container%{library_version}-devel = %{version} +Conflicts: libboost_charconv-devel-impl +Provides: libboost_charconv-devel-impl = %{version} + +%description -n libboost_charconv%{library_version}-devel +This package contains development headers for Boost.CharConv library. + %package -n %{package_name}-quickbook Summary: Documentation tool geared towards C++ Group: Development/Tools/Doc Generators @@ -1250,6 +1270,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch -P 20 -p1 %patch -P 21 -p1 %patch -P 22 -p2 +%patch -P 23 -p1 %build find . -type f -exec chmod u+w {} + @@ -1599,6 +1620,7 @@ EOF %post -n libboost_thread%{library_version} -p /sbin/ldconfig %post -n libboost_type_erasure%{library_version} -p /sbin/ldconfig %post -n libboost_json%{library_version} -p /sbin/ldconfig +%post -n libboost_charconv%{library_version} -p /sbin/ldconfig %post -n libboost_math%{library_version} -p /sbin/ldconfig %post -n libboost_nowide%{library_version} -p /sbin/ldconfig %post -n libboost_graph%{library_version} -p /sbin/ldconfig @@ -1651,6 +1673,7 @@ EOF %postun -n libboost_thread%{library_version} -p /sbin/ldconfig %postun -n libboost_type_erasure%{library_version} -p /sbin/ldconfig %postun -n libboost_json%{library_version} -p /sbin/ldconfig +%postun -n libboost_charconv%{library_version} -p /sbin/ldconfig %postun -n libboost_math%{library_version} -p /sbin/ldconfig %postun -n libboost_nowide%{library_version} -p /sbin/ldconfig %postun -n libboost_graph%{library_version} -p /sbin/ldconfig @@ -2055,6 +2078,14 @@ EOF %{package_libdir}/cmake/boost_json-%{version}/* %{package_libdir}/libboost_json.so +%files -n libboost_charconv%{library_version} +%{package_libdir}/libboost_charconv.so.%{version} + +%files -n libboost_charconv%{library_version}-devel +%dir %{package_libdir}/cmake/boost_charconv-%{version} +%{package_libdir}/cmake/boost_charconv-%{version}/* +%{package_libdir}/libboost_charconv.so + %endif %if ! %{build_base} diff --git a/boost_1_84_0.tar.bz2 b/boost_1_84_0.tar.bz2 deleted file mode 100644 index e4b384b..0000000 --- a/boost_1_84_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454 -size 123110547 diff --git a/boost_1_85_0.tar.bz2 b/boost_1_85_0.tar.bz2 new file mode 100644 index 0000000..c7fbc86 --- /dev/null +++ b/boost_1_85_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617 +size 124015250 diff --git a/dynamic_linking.patch b/dynamic_linking.patch index 5a0185d..e811b7f 100644 --- a/dynamic_linking.patch +++ b/dynamic_linking.patch @@ -37,12 +37,13 @@ Index: boost_1_80_0/libs/chrono/build/Jamfile.v2 gcc-3.4.4:--enable-auto-import gcc-4.3.4:--enable-auto-import gcc-4.4.0,windows:--enable-auto-import -@@ -104,7 +104,7 @@ lib boost_chrono +@@ -104,8 +104,8 @@ lib boost_chrono : $(SOURCES).cpp : - shared:BOOST_ALL_DYN_LINK=1 # tell source we're building dll's -- static:BOOST_All_STATIC_LINK=1 # tell source we're building static lib's -+ # static:BOOST_All_STATIC_LINK=1 # tell source we're building static lib's + $(cxx11-requirements) + shared:BOOST_CHRONO_DYN_LINK=1 # tell source we're building dll's +- static:BOOST_CHRONO_STATIC_LINK=1 # tell source we're building static lib's ++ # static:BOOST_CHRONO_STATIC_LINK=1 # tell source we're building static lib's ; boost-install boost_chrono ; @@ -105,6 +106,6 @@ Index: boost_1_80_0/libs/filesystem/build/Jamfile.v2 shared:BOOST_FILESYSTEM_DYN_LINK=1 - static:BOOST_FILESYSTEM_STATIC_LINK=1 +# static:BOOST_FILESYSTEM_STATIC_LINK=1 - : - : - ; + $(cxx_requirements) + : usage-requirements + $(cxx_requirements)