From 8489eb2802e042b78d9c022ff594ef296080f0c3 Mon Sep 17 00:00:00 2001
From: Patrick Diehl <me@diehlpk.de>
Date: Feb 01 2020 19:36:47 +0000
Subject: Update patch


---

diff --git a/4357.patch b/4357.patch
index f6ed9db..5420e7e 100644
--- a/4357.patch
+++ b/4357.patch
@@ -1,15 +1,35 @@
-From 29b484f58108036f0aedb7709fbd5388fb0cbd7a Mon Sep 17 00:00:00 2001
+From 32e6452519462781e7067ff615333156028a7ab9 Mon Sep 17 00:00:00 2001
 From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
 Date: Fri, 31 Jan 2020 11:16:18 -0600
 Subject: [PATCH] Adding missing #includes to fix gcc V10 linker problems
 
 - flyby: clean up -fPIC option
 ---
- src/CMakeLists.txt                                  | 7 ++++++-
- src/runtime/agas/component_namespace.cpp            | 1 +
- src/runtime/agas/server/symbol_namespace_server.cpp | 1 +
- 3 files changed, 8 insertions(+), 1 deletion(-)
+ libs/collectives/src/latch.cpp                |  1 +
+ src/CMakeLists.txt                            |  7 ++-
+ src/lcos/base_lco_with_value.cpp              |  1 +
+ src/lcos/base_lco_with_value_1.cpp            |  1 +
+ src/lcos/base_lco_with_value_2.cpp            |  1 +
+ src/lcos/base_lco_with_value_3.cpp            |  1 +
+ src/performance_counters/counters.cpp         |  1 +
+ src/runtime/agas/component_namespace.cpp      |  1 +
+ src/runtime/agas/locality_namespace.cpp       | 44 ++++++++++++-------
+ src/runtime/agas/primary_namespace.cpp        |  1 +
+ .../agas/server/symbol_namespace_server.cpp   |  1 +
+ 11 files changed, 42 insertions(+), 18 deletions(-)
 
+diff --git a/libs/collectives/src/latch.cpp b/libs/collectives/src/latch.cpp
+index faba68de09c..de9d2443e7b 100644
+--- a/libs/collectives/src/latch.cpp
++++ b/libs/collectives/src/latch.cpp
+@@ -14,6 +14,7 @@
+ #include <hpx/runtime/components/client_base.hpp>
+ #include <hpx/runtime/components/derived_component_factory.hpp>
+ #include <hpx/runtime/components/new.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ #include <hpx/util/serialize_exception.hpp>
+ 
+ #include <cstddef>
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index dd39f959bf5..33e0fd131aa 100644
 --- a/src/CMakeLists.txt
@@ -42,6 +62,66 @@ index dd39f959bf5..33e0fd131aa 100644
      target_compile_definitions(hpx_wrap PUBLIC HPX_ENABLE_ASSERT_HANDLER PRIVATE
        HPX_APPLICATION_EXPORTS)
  
+diff --git a/src/lcos/base_lco_with_value.cpp b/src/lcos/base_lco_with_value.cpp
+index 2345908eb22..0db06ce6876 100644
+--- a/src/lcos/base_lco_with_value.cpp
++++ b/src/lcos/base_lco_with_value.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <hpx/apply.hpp>
+ #include <hpx/lcos/base_lco_with_value.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ #include <hpx/runtime/naming/id_type.hpp>
+ #include <hpx/runtime/naming/name.hpp>
+ #include <hpx/serialization/vector.hpp>
+diff --git a/src/lcos/base_lco_with_value_1.cpp b/src/lcos/base_lco_with_value_1.cpp
+index 0ca3fe594a1..84dcb832493 100644
+--- a/src/lcos/base_lco_with_value_1.cpp
++++ b/src/lcos/base_lco_with_value_1.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <hpx/apply.hpp>
+ #include <hpx/lcos/base_lco_with_value.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ 
+ #include <cstdint>
+ 
+diff --git a/src/lcos/base_lco_with_value_2.cpp b/src/lcos/base_lco_with_value_2.cpp
+index 625e85b8c8a..3a07d0b0735 100644
+--- a/src/lcos/base_lco_with_value_2.cpp
++++ b/src/lcos/base_lco_with_value_2.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <hpx/apply.hpp>
+ #include <hpx/lcos/base_lco_with_value.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ 
+ #include <cstdint>
+ 
+diff --git a/src/lcos/base_lco_with_value_3.cpp b/src/lcos/base_lco_with_value_3.cpp
+index 2355378fb76..b0422e5bfc6 100644
+--- a/src/lcos/base_lco_with_value_3.cpp
++++ b/src/lcos/base_lco_with_value_3.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <hpx/apply.hpp>
+ #include <hpx/lcos/base_lco_with_value.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ #include <hpx/serialization/vector.hpp>
+ #include <hpx/util/ini.hpp>
+ 
+diff --git a/src/performance_counters/counters.cpp b/src/performance_counters/counters.cpp
+index 41923184c1c..646356d77d0 100644
+--- a/src/performance_counters/counters.cpp
++++ b/src/performance_counters/counters.cpp
+@@ -21,6 +21,7 @@
+ #include <hpx/runtime/actions/continuation.hpp>
+ #include <hpx/runtime/agas/interface.hpp>
+ #include <hpx/runtime/components/stubs/runtime_support.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ #include <hpx/runtime/get_num_localities.hpp>
+ #include <hpx/serialization/base_object.hpp>
+ #include <hpx/serialization/serialize.hpp>
 diff --git a/src/runtime/agas/component_namespace.cpp b/src/runtime/agas/component_namespace.cpp
 index 23f23e42ae5..e9236992e8a 100644
 --- a/src/runtime/agas/component_namespace.cpp
@@ -54,6 +134,100 @@ index 23f23e42ae5..e9236992e8a 100644
  #include <hpx/runtime/components/component_factory.hpp>
  #include <hpx/serialization/vector.hpp>
  
+diff --git a/src/runtime/agas/locality_namespace.cpp b/src/runtime/agas/locality_namespace.cpp
+index 5fb446d6a3e..3fce1f263b4 100644
+--- a/src/runtime/agas/locality_namespace.cpp
++++ b/src/runtime/agas/locality_namespace.cpp
+@@ -13,6 +13,7 @@
+ #include <hpx/runtime/actions/component_action.hpp>
+ #include <hpx/runtime/agas/locality_namespace.hpp>
+ #include <hpx/runtime/agas/server/locality_namespace.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ #include <hpx/runtime/components/component_factory.hpp>
+ #include <hpx/serialization/vector.hpp>
+ 
+@@ -30,43 +31,52 @@ HPX_REGISTER_BASE_LCO_WITH_VALUE_ID(
+     hpx::actions::base_lco_with_value_parcelset_endpoints_get,
+     hpx::actions::base_lco_with_value_parcelset_endpoints_set)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::allocate_action,
++///////////////////////////////////////////////////////////////////////////////
++// gcc 10 requires for the types below to be explicitly instantiated
++template HPX_EXPORT bool hpx::detail::apply_impl<
++    hpx::lcos::base_lco_with_value<hpx::parcelset::endpoints_type,
++        hpx::parcelset::endpoints_type,
++        hpx::traits::detail::component_tag>::set_value_action,
++    hpx::parcelset::endpoints_type>(hpx::naming::id_type const&,
++    hpx::naming::address&&, hpx::threads::thread_priority,
++    hpx::parcelset::endpoints_type&&);
++
++template HPX_EXPORT bool hpx::detail::apply_impl<
++    hpx::lcos::base_lco_with_value<hpx::parcelset::endpoints_type,
++        hpx::parcelset::endpoints_type,
++        hpx::traits::detail::managed_component_tag>::set_value_action,
++    hpx::parcelset::endpoints_type>(hpx::naming::id_type const&,
++    hpx::naming::address&&, hpx::threads::thread_priority,
++    hpx::parcelset::endpoints_type&&);
++
++HPX_REGISTER_ACTION_ID(locality_namespace::allocate_action,
+     locality_namespace_allocate_action,
+     hpx::actions::locality_namespace_allocate_action_id)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::free_action,
++HPX_REGISTER_ACTION_ID(locality_namespace::free_action,
+     locality_namespace_free_action,
+     hpx::actions::locality_namespace_free_action_id)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::localities_action,
++HPX_REGISTER_ACTION_ID(locality_namespace::localities_action,
+     locality_namespace_localities_action,
+     hpx::actions::locality_namespace_localities_action_id)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::resolve_locality_action,
++HPX_REGISTER_ACTION_ID(locality_namespace::resolve_locality_action,
+     locality_namespace_resolve_locality_action,
+     hpx::actions::locality_namespace_resolve_locality_action_id)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::get_num_localities_action,
++HPX_REGISTER_ACTION_ID(locality_namespace::get_num_localities_action,
+     locality_namespace_get_num_localities_action,
+     hpx::actions::locality_namespace_get_num_localities_action_id)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::get_num_threads_action,
++HPX_REGISTER_ACTION_ID(locality_namespace::get_num_threads_action,
+     locality_namespace_get_num_threads_action,
+     hpx::actions::locality_namespace_get_num_threads_action_id)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::get_num_overall_threads_action,
++HPX_REGISTER_ACTION_ID(locality_namespace::get_num_overall_threads_action,
+     locality_namespace_get_num_overall_threads_action,
+     hpx::actions::locality_namespace_get_num_overall_threads_action_id)
+ 
+-HPX_REGISTER_ACTION_ID(
+-    locality_namespace::statistics_counter_action,
++HPX_REGISTER_ACTION_ID(locality_namespace::statistics_counter_action,
+     locality_namespace_statistics_counter_action,
+     hpx::actions::locality_namespace_statistics_counter_action_id)
+-
+diff --git a/src/runtime/agas/primary_namespace.cpp b/src/runtime/agas/primary_namespace.cpp
+index 33928a624a4..2ba3ef880c4 100644
+--- a/src/runtime/agas/primary_namespace.cpp
++++ b/src/runtime/agas/primary_namespace.cpp
+@@ -14,6 +14,7 @@
+ #include <hpx/runtime/actions/continuation.hpp>
+ #include <hpx/runtime/agas/primary_namespace.hpp>
+ #include <hpx/runtime/agas/server/primary_namespace.hpp>
++#include <hpx/runtime/applier/apply.hpp>
+ #include <hpx/runtime/applier/apply_callback.hpp>
+ #include <hpx/runtime/components/component_factory.hpp>
+ #include <hpx/serialization/vector.hpp>
 diff --git a/src/runtime/agas/server/symbol_namespace_server.cpp b/src/runtime/agas/server/symbol_namespace_server.cpp
 index 436063ed470..b1eefebe41c 100644
 --- a/src/runtime/agas/server/symbol_namespace_server.cpp