Accepting request 1183456 from science:HPC

OBS-URL: https://build.opensuse.org/request/show/1183456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hpx?expand=0&rev=9

Add-missing-header-for-std-intmax_t.patch

@@ -1,18 +0,0 @@
-commit cb19c8b96d3ecb806d678385ae305a7dc29973e6
-Author: Jonathan Wakely <jwakely@redhat.com>
-Date:   Wed Feb 8 12:32:11 2023 +0000
-
-    Add missing header for std::intmax_t
-
-diff --git libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
-index 16378ff8d863..034c461f9fa2 100644
---- libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
-+++ libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
-@@ -18,6 +18,7 @@
- #include <hpx/type_support/lazy_conditional.hpp>
- 
- #include <cstddef>
-+#include <cstdint>
- #include <iterator>
- #include <type_traits>
- 

hpx.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Jun 25 14:29:37 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Udpate to 1.10.0
+  - See https://hpx-docs.stellar-group.org/tags/v1.10.0/html/releases/whats_new_1_10_0.html
+  for what's new.
+- Drop Add-missing-header-for-std-intmax_t.patch as it was fixed upstream.
+- Disable i586 build as asio-devel is not available.
+- Disable broken arm 32b build
+- Add explicit dependency to boost >= 1.71
+- Add patches to fix compilation on Leap 15.5 and 15.6
+  - remove-dependency-to-obsolete-boot-filesystem-path-basename.patch
+  - scope-fix-issue-with-GCC-9.patch
+  - remove-maybe_unused.patch
+
 -------------------------------------------------------------------
 Thu Feb 22 07:59:35 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

hpx.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hpx
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2019 Christoph Junghans
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,33 +18,36 @@
 
 
 Name:           hpx
-Version:        1.8.1
+Version:        1.10.0
 Release:        0
 Summary:        General Purpose C++ Runtime System
 License:        BSL-1.0
 Group:          Productivity/Networking/Other
 URL:            https://stellar.cct.lsu.edu/tag/hpx/
-Source0:        https://github.com/STEllAR-GROUP/hpx/archive/%{version}.tar.gz#/%{name}_%{version}.tar.gz
-Patch1:         Add-missing-header-for-std-intmax_t.patch
+Source0:        https://github.com/STEllAR-GROUP/hpx/archive/refs/tags/v%{version}.tar.gz#/%{name}_%{version}.tar.gz
+Patch1:         remove-dependency-to-obsolete-boot-filesystem-path-basename.patch
+Patch2:         scope-fix-issue-with-GCC-9.patch
+Patch3:         remove-maybe_unused.patch
 BuildRequires:  asio-devel
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gperftools-devel
 BuildRequires:  hwloc-devel
-BuildRequires:  libboost_atomic-devel
-BuildRequires:  libboost_filesystem-devel
-BuildRequires:  libboost_iostreams-devel
-BuildRequires:  libboost_program_options-devel
-BuildRequires:  libboost_regex-devel
-BuildRequires:  libboost_system-devel
+BuildRequires:  libboost_atomic-devel >= 1.71
+BuildRequires:  libboost_filesystem-devel >= 1.71
+BuildRequires:  libboost_iostreams-devel >= 1.71
+BuildRequires:  libboost_program_options-devel >= 1.71
+BuildRequires:  libboost_regex-devel >= 1.71
+BuildRequires:  libboost_system-devel >= 1.71
 %ifarch aarch64 %{arm}
-BuildRequires:  libboost_chrono-devel
-BuildRequires:  libboost_context-devel
-BuildRequires:  libboost_thread-devel
+BuildRequires:  libboost_chrono-devel >= 1.71
+BuildRequires:  libboost_context-devel >= 1.71
+BuildRequires:  libboost_thread-devel >= 1.71
 %endif
 BuildRequires:  openmpi-macros-devel
 Requires:       libhpx1 = %{version}-%{release}
+ExcludeArch:    i586 %arm
 
 %description
 HPX is a general purpose C++ runtime system for parallel and distributed applications of any scale.

hpx_1.10.0.tar.gz

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

hpx_1.8.1.tar.gz

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

remove-dependency-to-obsolete-boot-filesystem-path-basename.patch

@@ -0,0 +1,73 @@
+commit e6abade4e8d423f9082dc7f6b2ef9a07c43c15b4
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Wed Jun 26 11:44:02 2024 +0200
+
+    remove dependency to obsolete boot::filesystem::path::basename()
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git libs/core/command_line_handling_local/src/parse_command_line_local.cpp libs/core/command_line_handling_local/src/parse_command_line_local.cpp
+index 9ca8aa6b23f6..16d6da756933 100644
+--- libs/core/command_line_handling_local/src/parse_command_line_local.cpp
++++ libs/core/command_line_handling_local/src/parse_command_line_local.cpp
+@@ -261,7 +261,7 @@ namespace hpx::local::detail {
+ 
+         filesystem::path dir(filesystem::initial_path());
+         filesystem::path const app(appname);
+-        appname = filesystem::basename(app.filename());
++        appname = app.stem().string();
+ 
+         // walk up the hierarchy, trying to find a file <appname>.cfg
+         while (!dir.empty())
+diff --git libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
+index e8bc2e45e0f5..e2620f6f2f57 100644
+--- libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
++++ libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
+@@ -136,7 +136,7 @@ namespace hpx::util::plugin {
+             namespace fs = filesystem;
+ 
+             fs::path const dll_path(dll_name);
+-            map_name = fs::basename(dll_path);
++            map_name = dll_path.stem().string();
+         }
+ 
+         void load_library(error_code& ec = throws)
+diff --git libs/core/plugin/include/hpx/plugin/detail/dll_windows.hpp libs/core/plugin/include/hpx/plugin/detail/dll_windows.hpp
+index a01bc60ac997..a7178860d9e7 100644
+--- libs/core/plugin/include/hpx/plugin/detail/dll_windows.hpp
++++ libs/core/plugin/include/hpx/plugin/detail/dll_windows.hpp
+@@ -60,7 +60,7 @@ namespace hpx::util::plugin {
+             namespace fs = filesystem;
+ 
+             fs::path const dll_path(dll_name);
+-            map_name = fs::basename(dll_path);
++            map_name = dll_path.stem().string();
+         }
+ 
+         void load_library(error_code& ec = throws)
+diff --git libs/core/runtime_configuration/src/init_ini_data.cpp libs/core/runtime_configuration/src/init_ini_data.cpp
+index 644f0dc2ddd5..78e0cc679c06 100644
+--- libs/core/runtime_configuration/src/init_ini_data.cpp
++++ libs/core/runtime_configuration/src/init_ini_data.cpp
+@@ -433,7 +433,7 @@ namespace hpx::util {
+                     continue;
+ 
+                 // instance name and module name are the same
+-                std::string name(fs::basename(curr));    //-V821
++                std::string name(curr.stem().string());    //-V821
+ 
+ #if !defined(HPX_WINDOWS)
+                 if (0 == name.find("lib"))
+diff --git libs/full/command_line_handling/src/parse_command_line.cpp libs/full/command_line_handling/src/parse_command_line.cpp
+index 2729ffa6db87..422d500ee5bf 100644
+--- libs/full/command_line_handling/src/parse_command_line.cpp
++++ libs/full/command_line_handling/src/parse_command_line.cpp
+@@ -160,7 +160,7 @@ namespace hpx::util {
+ 
+             filesystem::path dir(filesystem::initial_path());
+             filesystem::path const app(appname);
+-            appname = filesystem::basename(app.filename());
++            appname = app.stem().string();
+ 
+             // walk up the hierarchy, trying to find a file <appname>.cfg
+             while (!dir.empty())

remove-maybe_unused.patch

@@ -0,0 +1,23 @@
+commit fa5d633ee56cce1e09d9e423b380cfe6f811526c
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Wed Jun 26 15:27:48 2024 +0200
+
+    remove maybe_unused
+    
+    For some reason GCC < 9 does not like this one
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git libs/core/executors/include/hpx/executors/service_executors.hpp libs/core/executors/include/hpx/executors/service_executors.hpp
+index 297b49d9bec3..f7697164b4f2 100644
+--- libs/core/executors/include/hpx/executors/service_executors.hpp
++++ libs/core/executors/include/hpx/executors/service_executors.hpp
+@@ -47,7 +47,7 @@ namespace hpx::parallel::execution::detail {
+             hpx::execution::experimental::static_chunk_size;
+ 
+         explicit service_executor(
+-            [[maybe_unused]] hpx::util::io_service_pool* pool) noexcept
++            hpx::util::io_service_pool* pool) noexcept
+ #if defined(HPX_COMPUTE_HOST_CODE)
+           : pool_(pool)
+ #endif

scope-fix-issue-with-GCC-9.patch

@@ -0,0 +1,27 @@
+commit 8a4e5a63607cc29d62dd53ce824a41746ed09595
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Wed Jun 26 12:05:45 2024 +0200
+
+    scope: fix issue with GCC < 9
+    
+    https://github.com/martinmoene/scope-lite/issues/12
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git libs/core/functional/include/hpx/functional/experimental/scope_success.hpp libs/core/functional/include/hpx/functional/experimental/scope_success.hpp
+index 7e3e742f5d48..b018156baaf0 100644
+--- libs/core/functional/include/hpx/functional/experimental/scope_success.hpp
++++ libs/core/functional/include/hpx/functional/experimental/scope_success.hpp
+@@ -54,8 +54,10 @@ namespace hpx::experimental {
+             scope_success& operator=(scope_success const&) = delete;
+             scope_success& operator=(scope_success&& rhs) = delete;
+ 
+-            HPX_CONSTEXPR_DESTRUCTOR ~scope_success() noexcept(
+-                noexcept(this->f()))
++            HPX_CONSTEXPR_DESTRUCTOR ~scope_success()
++#if __GNUC__ >= 9
++		noexcept(noexcept(this->f()))
++#endif
+             {
+                 if (active >= std::uncaught_exceptions())
+                 {