From e25c79031e89cc41a5ea46245d8361bc7bda967db0cc898dc8f15c7aeb75b71b Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Tue, 12 Sep 2023 08:16:58 +0000 Subject: [PATCH 1/3] Accepting request 1110449 from home:aschnell:boost - update to 1.83.0 * new libraries: + Compat - Header-only Library. * for details on all changes see, https://www.boost.org/users/history/version_1_83_0.html - dynamic_linking.patch: updated - boost-mpi-noreturn.patch: added OBS-URL: https://build.opensuse.org/request/show/1110449 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=316 --- baselibs.conf | 54 ++++++++++++++++++++-------------------- boost-mpi-noreturn.patch | 12 +++++++++ boost.changes | 13 +++++++++- boost.spec | 13 ++++++---- boost_1_82_0.tar.bz2 | 3 --- boost_1_83_0.tar.bz2 | 3 +++ dynamic_linking.patch | 26 ++++++++----------- 7 files changed, 73 insertions(+), 51 deletions(-) create mode 100644 boost-mpi-noreturn.patch delete mode 100644 boost_1_82_0.tar.bz2 create mode 100644 boost_1_83_0.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index 2073533..02455b3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,27 +1,27 @@ -libboost_atomic1_82_0 -libboost_container1_82_0 -libboost_context1_82_0 -libboost_coroutine1_82_0 -libboost_date_time1_82_0 -libboost_fiber1_82_0 -libboost_filesystem1_82_0 -libboost_graph1_82_0 -libboost_graph_parallel1_82_0 -libboost_iostreams1_82_0 -libboost_locale1_82_0 -libboost_math1_82_0 -libboost_mpi1_82_0 -libboost_nowide1_82_0 -libboost_test1_82_0 -libboost_program_options1_82_0 -libboost_python-py3-1_82_0 -libboost_random1_82_0 -libboost_serialization1_82_0 -libboost_stacktrace1_82_0 -libboost_system1_82_0 -libboost_thread1_82_0 -libboost_type_erasure1_82_0 -libboost_wave1_82_0 -libboost_url1_82_0 -libboost_regex1_82_0 -libboost_json1_82_0 +libboost_atomic1_83_0 +libboost_container1_83_0 +libboost_context1_83_0 +libboost_coroutine1_83_0 +libboost_date_time1_83_0 +libboost_fiber1_83_0 +libboost_filesystem1_83_0 +libboost_graph1_83_0 +libboost_graph_parallel1_83_0 +libboost_iostreams1_83_0 +libboost_locale1_83_0 +libboost_math1_83_0 +libboost_mpi1_83_0 +libboost_nowide1_83_0 +libboost_test1_83_0 +libboost_program_options1_83_0 +libboost_python-py3-1_83_0 +libboost_random1_83_0 +libboost_serialization1_83_0 +libboost_stacktrace1_83_0 +libboost_system1_83_0 +libboost_thread1_83_0 +libboost_type_erasure1_83_0 +libboost_wave1_83_0 +libboost_url1_83_0 +libboost_regex1_83_0 +libboost_json1_83_0 diff --git a/boost-mpi-noreturn.patch b/boost-mpi-noreturn.patch new file mode 100644 index 0000000..b7da04e --- /dev/null +++ b/boost-mpi-noreturn.patch @@ -0,0 +1,12 @@ +diff -r -u boost_1_83_0-orig/boost/mpi/environment.hpp boost_1_83_0/boost/mpi/environment.hpp +--- boost_1_83_0-orig/boost/mpi/environment.hpp 2023-08-08 23:02:53.000000000 +0200 ++++ boost_1_83_0/boost/mpi/environment.hpp 2023-09-12 08:36:01.310536799 +0200 +@@ -176,7 +176,7 @@ + * @param errcode The error code to return to the environment. + * @returns Will not return. + */ +- static void abort(int errcode); ++ [[noreturn]] static void abort(int errcode); + + /** Determine if the MPI environment has already been initialized. + * diff --git a/boost.changes b/boost.changes index 94bc6c0..11f1116 100644 --- a/boost.changes +++ b/boost.changes @@ -1,8 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 05 07:39:53 CEST 2023 - aschnell@suse.com + +- update to 1.83.0 + * new libraries: + + Compat - Header-only Library. + * for details on all changes see, + https://www.boost.org/users/history/version_1_83_0.html +- dynamic_linking.patch: updated +- boost-mpi-noreturn.patch: added + ------------------------------------------------------------------- Thu Apr 20 10:04:18 CEST 2023 - aschnell@suse.com - update to 1.82.0 - * new libraries: + * new libraries: + MySQL - MySQL Header-only Library. * for details on all changes see, https://www.boost.org/users/history/version_1_82_0.html diff --git a/boost.spec b/boost.spec index 0ca9b2e..fa00639 100644 --- a/boost.spec +++ b/boost.spec @@ -19,9 +19,9 @@ # %global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.82.0 -%define _ver 1_82_0 -%define package_version 1_82_0 +%define ver 1.83.0 +%define _ver 1_83_0 +%define package_version 1_83_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.82.0 +Version: 1.83.0 Release: 0 -%define library_version 1_82_0 +%define library_version 1_83_0 Summary: Boost C++ Libraries License: BSL-1.0 Group: Development/Libraries/C and C++ @@ -267,6 +267,8 @@ Patch18: dynamic_linking.patch Patch20: python_library_name.patch Patch21: boost-remove-cmakedir.patch Patch22: boost-process.patch +# https://github.com/boostorg/mpi/issues/149 +Patch50: boost-mpi-noreturn.patch %{?suse_build_hwcaps_libs} BuildRequires: fdupes BuildRequires: gmp-devel @@ -1279,6 +1281,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch20 -p1 %patch21 -p1 %patch22 -p2 +%patch50 -p1 %build find . -type f -exec chmod u+w {} + diff --git a/boost_1_82_0.tar.bz2 b/boost_1_82_0.tar.bz2 deleted file mode 100644 index da32da0..0000000 --- a/boost_1_82_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 -size 121325129 diff --git a/boost_1_83_0.tar.bz2 b/boost_1_83_0.tar.bz2 new file mode 100644 index 0000000..91089ff --- /dev/null +++ b/boost_1_83_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e +size 122892751 diff --git a/dynamic_linking.patch b/dynamic_linking.patch index f9e22fd..5a0185d 100644 --- a/dynamic_linking.patch +++ b/dynamic_linking.patch @@ -70,21 +70,17 @@ Index: boost_1_80_0/libs/system/build/Jamfile.v2 boost-install boost_system ; Index: boost_1_80_0/libs/timer/build/Jamfile.v2 =================================================================== ---- boost_1_80_0.orig/libs/timer/build/Jamfile.v2 -+++ boost_1_80_0/libs/timer/build/Jamfile.v2 -@@ -13,7 +13,7 @@ project boost/timer - /boost/chrono//boost_chrono - : usage-requirements # pass these requirement to dependants (i.e. users) - shared:BOOST_TIMER_DYN_LINK=1 -- static:BOOST_TIMER_STATIC_LINK=1 -+# static:BOOST_TIMER_STATIC_LINK=1 - ; - - SOURCES = auto_timers_construction cpu_timer ; -@@ -21,7 +21,7 @@ SOURCES = auto_timers_construction cpu_t - lib boost_timer - : $(SOURCES).cpp - : shared:BOOST_TIMER_DYN_LINK=1 +--- boost_1_83_0.orig/libs/timer/build/Jamfile.v2 ++++ boost_1_83_0/libs/timer/build/Jamfile.v2 +@@ -15,11 +15,11 @@ + : ../src/$(SOURCES).cpp + : # requirements + shared:BOOST_TIMER_DYN_LINK=1 +- static:BOOST_TIMER_STATIC_LINK=1 ++# static:BOOST_TIMER_STATIC_LINK=1 + : # default-build + : # usage-requirements + shared:BOOST_TIMER_DYN_LINK=1 - static:BOOST_TIMER_STATIC_LINK=1 +# static:BOOST_TIMER_STATIC_LINK=1 ; From 5810b1f9da4c86a45ed1eda4c90c32877f9d4418b8d34add8dd214194b9fe82e Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Tue, 24 Oct 2023 14:53:09 +0000 Subject: [PATCH 2/3] Accepting request 1119897 from home:NMorey:branches:science - Drop support for obsolete openmpi[123] - Prepare support for openmpi5 OBS-URL: https://build.opensuse.org/request/show/1119897 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=317 --- _multibuild | 2 -- boost.changes | 6 ++++ boost.spec | 82 ++++++++++++++++----------------------------------- 3 files changed, 31 insertions(+), 59 deletions(-) diff --git a/_multibuild b/_multibuild index 3256abe..781e94b 100644 --- a/_multibuild +++ b/_multibuild @@ -2,8 +2,6 @@ base extra gnu-hpc - gnu-openmpi2-hpc - gnu-openmpi3-hpc gnu-openmpi4-hpc gnu-mvapich2-hpc gnu-mpich-hpc diff --git a/boost.changes b/boost.changes index 11f1116..849c8e5 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 24 08:09:17 UTC 2023 - Nicolas Morey + +- Drop support for obsolete openmpi[123] +- Prepare support for openmpi5 + ------------------------------------------------------------------- Tue Sep 05 07:39:53 CEST 2023 - aschnell@suse.com diff --git a/boost.spec b/boost.spec index fa00639..1fe334a 100644 --- a/boost.spec +++ b/boost.spec @@ -75,29 +75,6 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif -%if "%{flavor}" == "gnu-openmpi2-hpc" -%define build_base 0 -%define mpi_vers 2 -%define compiler_family gnu -%define mpi_flavor openmpi -%undefine c_f_ver -%bcond_without hpc -%bcond_without mpi -%bcond_without python3 -%endif - -%if "%{flavor}" == "gnu-openmpi3-hpc" -%{?DisOMPI3} -%define build_base 0 -%define mpi_vers 3 -%define compiler_family gnu -%define mpi_flavor openmpi -%undefine c_f_ver -%bcond_without hpc -%bcond_without mpi -%bcond_without python3 -%endif - %if "%{flavor}" == "gnu-openmpi4-hpc" %{?DisOMPI4} %define build_base 0 @@ -110,6 +87,18 @@ ExclusiveArch: do_not_build %bcond_without python3 %endif +%if "%{flavor}" == "gnu-openmpi5-hpc" +%{?DisOMPI5} +%define build_base 0 +%define mpi_vers 5 +%define compiler_family gnu +%define mpi_flavor openmpi +%undefine c_f_ver +%bcond_without hpc +%bcond_without mpi +%bcond_without python3 +%endif + %if "%{flavor}" == "gnu-mvapich2-hpc" %define build_base 0 %define compiler_family gnu @@ -120,39 +109,6 @@ ExclusiveArch: do_not_build %bcond_without python3 %endif -%if "%{flavor}" == "gnu-mpich-hpc" -%define build_base 0 -%define compiler_family gnu -%define mpi_flavor mpich -%undefine c_f_ver -%bcond_without hpc -%bcond_without mpi -%bcond_without python3 -%endif -# -%if "%{flavor}" == "gnu10-openmpi2-hpc" -%define build_base 0 -%define mpi_vers 2 -%define compiler_family gnu -%define mpi_flavor openmpi -%define c_f_ver 10 -%bcond_without hpc -%bcond_without mpi -%bcond_without python3 -%endif - -%if "%{flavor}" == "gnu10-openmpi3-hpc" -%{?DisOMPI3} -%define build_base 0 -%define mpi_vers 3 -%define compiler_family gnu -%define mpi_flavor openmpi -%define c_f_ver 10 -%bcond_without hpc -%bcond_without mpi -%bcond_without python3 -%endif - %if "%{flavor}" == "gnu10-openmpi4-hpc" %{?DisOMPI4} %define build_base 0 @@ -165,6 +121,18 @@ ExclusiveArch: do_not_build %bcond_without python3 %endif +%if "%{flavor}" == "gnu10-openmpi5-hpc" +%{?DisOMPI5} +%define build_base 0 +%define mpi_vers 5 +%define compiler_family gnu +%define mpi_flavor openmpi +%define c_f_ver 10 +%bcond_without hpc +%bcond_without mpi +%bcond_without python3 +%endif + %if "%{flavor}" == "gnu10-mvapich2-hpc" %define build_base 0 %define compiler_family gnu @@ -268,7 +236,7 @@ Patch20: python_library_name.patch Patch21: boost-remove-cmakedir.patch Patch22: boost-process.patch # https://github.com/boostorg/mpi/issues/149 -Patch50: boost-mpi-noreturn.patch +Patch50: boost-mpi-noreturn.patch %{?suse_build_hwcaps_libs} BuildRequires: fdupes BuildRequires: gmp-devel From ab20788c9fc0a802bc23400e9093d4c588d673de62599d2d89c783eff5b08019 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Thu, 26 Oct 2023 15:03:42 +0000 Subject: [PATCH 3/3] Accepting request 1120597 from home:NMorey:branches:science - Fix build for gnu-mpich-hpc broken by previous update OBS-URL: https://build.opensuse.org/request/show/1120597 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=318 --- boost.changes | 5 +++++ boost.spec | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/boost.changes b/boost.changes index 849c8e5..e13556e 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 26 14:08:59 UTC 2023 - Nicolas Morey + +- Fix build for gnu-mpich-hpc broken by previous update + ------------------------------------------------------------------- Tue Oct 24 08:09:17 UTC 2023 - Nicolas Morey diff --git a/boost.spec b/boost.spec index 1fe334a..3e248cf 100644 --- a/boost.spec +++ b/boost.spec @@ -109,6 +109,16 @@ ExclusiveArch: do_not_build %bcond_without python3 %endif +%if "%{flavor}" == "gnu-mpich-hpc" +%define build_base 0 +%define compiler_family gnu +%define mpi_flavor mpich +%undefine c_f_ver +%bcond_without hpc +%bcond_without mpi +%bcond_without python3 +%endif + %if "%{flavor}" == "gnu10-openmpi4-hpc" %{?DisOMPI4} %define build_base 0