[gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/

[Joonas Niilola]

commit:     14fe4e4392d78029ea9d761696b3b3d4fda08999
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Sep 18 20:04:19 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:47:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fe4e43

sys-cluster/hpx: Drop old

The new version v1.5 builds with clang and boost-1.74. So, the build failure
bugs related to v1.4 can be closed.

Closes: https://bugs.gentoo.org/741960
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 sys-cluster/hpx/Manifest                           |   1 -
 sys-cluster/hpx/files/hpx-1.4.1-boost.patch        |  30 ----
 .../files/hpx-1.4.1-disable-failing-tests.patch    | 157 ---------------------
 sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch  |  79 -----------
 sys-cluster/hpx/files/hpx-1.4.1-python.patch       |  37 -----
 sys-cluster/hpx/hpx-1.4.1.ebuild                   | 120 ----------------
 6 files changed, 424 deletions(-)

diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 519246709a7..b94551a449f 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,2 +1 @@
 DIST hpx-1.5.1.tar.gz 4576475 BLAKE2B 8702638461f92d9d94d0e2ac4ec32527d995a45f54babcbf08d644d1cac8fa37692fb66f59e221930f7738861b41a93fd0ab64d11c4e46d4e039ff3b0e4fec72 SHA512 ab2603adca8780808b62b55f57a03bf8491b805665831c1c484eeba8e7b306bb3269884c8940ad2fc4c5b0d679c54b1e33bc077cdb7ea6d1cb9a715ff70b9842
-DIST hpx_1.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582

diff --git a/sys-cluster/hpx/files/hpx-1.4.1-boost.patch b/sys-cluster/hpx/files/hpx-1.4.1-boost.patch
deleted file mode 100644
index 939f4f77813..00000000000
--- a/sys-cluster/hpx/files/hpx-1.4.1-boost.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1a3615f30491320d48e45005ad7b032fb3c1821d Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@×××××××××××××.de>
-Date: Sun, 22 Mar 2020 12:49:59 +0100
-Subject: [PATCH] cmake: Remove passing of BOOST_ROOT
-
-That variable is not used and generates QA issues:
-
- * One or more CMake variables were not used by the project:
-   *   BOOST_ROOT
-
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
----
- tests/unit/build/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt
-index 757f4887fba2..2163b853fbad 100644
---- a/tests/unit/build/CMakeLists.txt
-+++ b/tests/unit/build/CMakeLists.txt
-@@ -38,7 +38,6 @@ function(create_cmake_test name hpx_dir)
-       "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}"
-       "${PROJECT_SOURCE_DIR}/examples/hello_world_component"
-       -DHPX_DIR=${hpx_dir}
--      -DBOOST_ROOT=${BOOST_ROOT}
-       ${ADDITIONAL_CMAKE_OPTIONS}
-       -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE}
-       -DCMAKE_BUILD_TYPE=$<CONFIGURATION> VERBATIM)
--- 
-2.24.1
-

diff --git a/sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch b/sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch
deleted file mode 100644
index 492cbaf2378..00000000000
--- a/sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 10577db8e8ca556dc98b1c0010b7e53416e22b22 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@×××××××××××××.de>
-Date: Tue, 17 Mar 2020 11:21:53 +0100
-Subject: [PATCH] tests: Disable failing tests
-
-Currently six tests are failing:
-
-|99% tests passed, 6 tests failed out of 712
-|
-|Total Test time (real) = 2268.99 sec
-|
-|The following tests FAILED:
-|        339 - tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector_adjacent_find1 (Failed)
-|        454 - tests.regressions.dynamic_counters_loaded_1508 (Failed)
-|        601 - tests.unit.component.launch_process (Timeout)
-|        678 - tests.unit.threads.distributed.tcp.thread_stacksize (Failed)
-|        681 - tests.unit.topology.numa_allocator (Failed)
-|        712 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed)
-
-Needs to be further investigated. Disable them for now.
-
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
----
- .../tests/unit/CMakeLists.txt                 |  2 +-
- tests/regressions/CMakeLists.txt              |  2 +-
- tests/unit/component/CMakeLists.txt           | 36 +++++++++----------
- tests/unit/parcelset/CMakeLists.txt           |  2 +-
- tests/unit/threads/CMakeLists.txt             |  2 +-
- tests/unit/topology/CMakeLists.txt            |  6 ++--
- 6 files changed, 25 insertions(+), 25 deletions(-)
-
-diff --git a/libs/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/segmented_algorithms/tests/unit/CMakeLists.txt
-index 1ed7dbd7798a..17d5e4cca3b4 100644
---- a/libs/segmented_algorithms/tests/unit/CMakeLists.txt
-+++ b/libs/segmented_algorithms/tests/unit/CMakeLists.txt
-@@ -7,7 +7,7 @@
- set(tests
-     partitioned_vector_adjacent_difference1
-     partitioned_vector_adjacent_difference2
--    partitioned_vector_adjacent_find1
-+    # partitioned_vector_adjacent_find1
-     partitioned_vector_adjacent_find2
-     partitioned_vector_all_of1
-     partitioned_vector_all_of2
-diff --git a/tests/regressions/CMakeLists.txt b/tests/regressions/CMakeLists.txt
-index 5a70ab8bfc99..fa4574ee0bf3 100644
---- a/tests/regressions/CMakeLists.txt
-+++ b/tests/regressions/CMakeLists.txt
-@@ -25,7 +25,7 @@ foreach(subdir ${subdirs})
- endforeach()
- 
- set(tests
--    dynamic_counters_loaded_1508
-+    # dynamic_counters_loaded_1508
-     id_type_ref_counting_1032
-     multiple_init
-     multiple_init_2918
-diff --git a/tests/unit/component/CMakeLists.txt b/tests/unit/component/CMakeLists.txt
-index 8deacffedb7b..49511e82e478 100644
---- a/tests/unit/component/CMakeLists.txt
-+++ b/tests/unit/component/CMakeLists.txt
-@@ -29,25 +29,25 @@ set(tests
-    )
- 
- if(HPX_WITH_NETWORKING)
--    set(tests ${tests}
--        launch_process
--       )
-+    # set(tests ${tests}
-+    #     launch_process
-+    #    )
- 
-     # add executable needed for launch_process_test
--    add_hpx_executable(launched_process_test
--      INTERNAL_FLAGS
--      SOURCES launched_process.cpp
--      EXCLUDE_FROM_ALL
--      HPX_PREFIX ${HPX_BUILD_PREFIX}
--      FOLDER "Tests/Unit/Components"
--      COMPONENT_DEPENDENCIES launch_process_test_server)
--
--    set(launch_process_FLAGS
--        DEPENDENCIES iostreams_component process_component
--                     launch_process_test_server_component)
--    set(launch_process_PARAMETERS
--      --launch=$<TARGET_FILE:launched_process_test>
--      --hpx:expect-connecting-localities)
-+    # add_hpx_executable(launched_process_test
-+    #   INTERNAL_FLAGS
-+    #   SOURCES launched_process.cpp
-+    #   EXCLUDE_FROM_ALL
-+    #   HPX_PREFIX ${HPX_BUILD_PREFIX}
-+    #   FOLDER "Tests/Unit/Components"
-+    #   COMPONENT_DEPENDENCIES launch_process_test_server)
-+
-+    # set(launch_process_FLAGS
-+    #     DEPENDENCIES iostreams_component process_component
-+    #                  launch_process_test_server_component)
-+    # set(launch_process_PARAMETERS
-+    #   --launch=$<TARGET_FILE:launched_process_test>
-+    #   --hpx:expect-connecting-localities)
- endif()
- 
- set(action_invoke_no_more_than_PARAMETERS
-@@ -123,5 +123,5 @@ foreach(test ${tests})
- endforeach()
- 
- if(HPX_WITH_NETWORKING)
--  add_hpx_pseudo_dependencies(tests.unit.component.launch_process launched_process_test)
-+  # add_hpx_pseudo_dependencies(tests.unit.component.launch_process launched_process_test)
- endif()
-diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt
-index 93c5844b9210..ec2ffacd0f99 100644
---- a/tests/unit/parcelset/CMakeLists.txt
-+++ b/tests/unit/parcelset/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(put_parcels_FLAGS DEPENDENCIES iostreams_component)
- set(set_parcel_write_handler_PARAMETERS LOCALITIES 2)
- 
- if(HPX_WITH_PARCEL_COALESCING)
--  set(tests ${tests} put_parcels_with_coalescing)
-+  # set(tests ${tests} put_parcels_with_coalescing)
-   set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
-   set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component parcel_coalescing)
- endif()
-diff --git a/tests/unit/threads/CMakeLists.txt b/tests/unit/threads/CMakeLists.txt
-index df0a1eff4dbb..d542d24136b7 100644
---- a/tests/unit/threads/CMakeLists.txt
-+++ b/tests/unit/threads/CMakeLists.txt
-@@ -17,7 +17,7 @@ set(tests
-     thread_id
-     thread_launching
-     thread_mf
--    thread_stacksize
-+    # thread_stacksize
-     thread_suspension_executor
-     thread_yield
-    )
-diff --git a/tests/unit/topology/CMakeLists.txt b/tests/unit/topology/CMakeLists.txt
-index 8a8a26b294fb..9f6311395c61 100644
---- a/tests/unit/topology/CMakeLists.txt
-+++ b/tests/unit/topology/CMakeLists.txt
-@@ -5,9 +5,9 @@
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
- if (HPX_WITH_SHARED_PRIORITY_SCHEDULER AND HPX_WITH_CXX14_RETURN_TYPE_DEDUCTION)
--  set(tests ${tests}
--    numa_allocator
--  )
-+  # set(tests ${tests}
-+  #   numa_allocator
-+  # )
- 
-   # NB. threads = -2 = threads = 'cores'
-   # NB. threads = -1 = threads = 'all'
--- 
-2.24.1
-

diff --git a/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
deleted file mode 100644
index 94271e6c0ec..00000000000
--- a/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6bdbb6a3ad6ea57c46e9998e9efd46f86f5d5729 Mon Sep 17 00:00:00 2001
-From: Hartmut Kaiser <hartmut.kaiser@×××××.com>
-Date: Tue, 28 Apr 2020 09:52:08 -0500
-Subject: [PATCH] Adding missing using placeholder::_X
-
-- flyby remove unneeded using statements
-
-(cherry picked from commit 1a6882195f9dc8d333ad12898fb88e3ca2931022)
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
----
- src/performance_counters/registry.cpp                         | 3 ---
- src/runtime/agas/addressing_service.cpp                       | 3 ++-
- tests/performance/network/network_storage/network_storage.cpp | 1 -
- 3 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/performance_counters/registry.cpp b/src/performance_counters/registry.cpp
-index 34c8d0e71d55..8da91f379a72 100644
---- a/src/performance_counters/registry.cpp
-+++ b/src/performance_counters/registry.cpp
-@@ -378,7 +378,6 @@ namespace hpx { namespace performance_counters
-     counter_status registry::create_raw_counter_value(counter_info const& info,
-         std::int64_t* countervalue, naming::gid_type& id, error_code& ec)
-     {
--        using util::placeholders::_1;
-         hpx::util::function_nonser<std::int64_t(bool)> func(
-             util::bind_front(wrap_counter, countervalue));
-         return create_raw_counter(info, func, id, ec);
-@@ -401,7 +400,6 @@ namespace hpx { namespace performance_counters
-         hpx::util::function_nonser<std::int64_t()> const& f, naming::gid_type& id,
-         error_code& ec)
-     {
--        using util::placeholders::_1;
-         hpx::util::function_nonser<std::int64_t(bool)> func(
-             util::bind_front(&wrap_raw_counter, f));
-         return create_raw_counter(info, func, id, ec);
-@@ -465,7 +463,6 @@ namespace hpx { namespace performance_counters
-         hpx::util::function_nonser<std::vector<std::int64_t>()> const& f,
-         naming::gid_type& id, error_code& ec)
-     {
--        using util::placeholders::_1;
-         hpx::util::function_nonser<std::vector<std::int64_t>(bool)> func(
-             util::bind_front(&wrap_raw_values_counter, f));
-         return create_raw_counter(info, func, id, ec);
-diff --git a/src/runtime/agas/addressing_service.cpp b/src/runtime/agas/addressing_service.cpp
-index f30760c0e05e..b416a28d12d8 100644
---- a/src/runtime/agas/addressing_service.cpp
-+++ b/src/runtime/agas/addressing_service.cpp
-@@ -1864,7 +1864,6 @@ future<hpx::id_type> addressing_service::on_symbol_namespace_event(
-     hpx::future<bool> f =
-         symbol_ns_.on_event(name, call_for_past_events, p.get_id());
- 
--    using util::placeholders::_1;
-     return f.then(
-         hpx::launch::sync,
-         util::one_shot(util::bind_back(
-@@ -2356,6 +2355,8 @@ void addressing_service::register_counter_types()
-         util::bind_front(
-             &addressing_service::get_cache_erase_entry_time, this));
- 
-+    using util::placeholders::_1;
-+    using util::placeholders::_2;
-     performance_counters::generic_counter_type_data const counter_types[] =
-     {
-         { "/agas/count/cache/entries", performance_counters::counter_raw,
-diff --git a/tests/performance/network/network_storage/network_storage.cpp b/tests/performance/network/network_storage/network_storage.cpp
-index 33fc1a66afa4..dfcffbafb180 100644
---- a/tests/performance/network/network_storage/network_storage.cpp
-+++ b/tests/performance/network/network_storage/network_storage.cpp
-@@ -802,7 +802,6 @@ void test_read(
-                 ++FuturesWaiting[send_rank];
-                 std::lock_guard<hpx::lcos::local::spinlock> lk(FuturesMutex);
- #endif
--                using hpx::util::placeholders::_1;
-                 std::size_t buffer_address =
-                     reinterpret_cast<std::size_t>(general_buffer.data());
-                 //
--- 
-2.26.2
-

diff --git a/sys-cluster/hpx/files/hpx-1.4.1-python.patch b/sys-cluster/hpx/files/hpx-1.4.1-python.patch
deleted file mode 100644
index d28c8a61f23..00000000000
--- a/sys-cluster/hpx/files/hpx-1.4.1-python.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 641d9766c73d2ee08aac8e1e0dd123b9d6db0c25 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@×××××××××××××.de>
-Date: Tue, 17 Mar 2020 16:20:35 +0100
-Subject: [PATCH] cmake: python: Use standard python interpreter
-
-These scripts are needed during build and run time. So, use a python interpreter
-which works for both cases.
-
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
----
- cmake/templates/hpxcxx.in    | 2 +-
- cmake/templates/hpxrun.py.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in
-index 81f38f89367d..a0fd7837b066 100755
---- a/cmake/templates/hpxcxx.in
-+++ b/cmake/templates/hpxcxx.in
-@@ -1,4 +1,4 @@
--#! @PYTHON_EXECUTABLE@
-+#! /usr/bin/env python
- #
- # Copyright (c) 2014 Steven R. Brandt
- #
-diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
-index 0e9f04a60495..7ccd2715a697 100755
---- a/cmake/templates/hpxrun.py.in
-+++ b/cmake/templates/hpxrun.py.in
-@@ -1,4 +1,4 @@
--#! @PYTHON_EXECUTABLE@
-+#! /usr/bin/env python
- #
- # Copyright (c) 2014 Thomas Heller
- #
--- 
-2.24.1
-

diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild
deleted file mode 100644
index 7206bca4082..00000000000
--- a/sys-cluster/hpx/hpx-1.4.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"
-else
-	SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-inherit cmake fortran-2 python-single-r1 check-reqs multiprocessing
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	?? ( jemalloc perftools tbb )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/breathe-4.14[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost:=
-	sys-apps/hwloc
-	sys-libs/zlib
-	mpi? ( virtual/mpi )
-	papi? ( dev-libs/papi )
-	perftools? ( dev-util/google-perftools )
-	tbb? ( dev-cpp/tbb )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-boost.patch"
-	"${FILESDIR}/${P}-disable-failing-tests.patch"
-	"${FILESDIR}/${P}-placeholder.patch"
-	"${FILESDIR}/${P}-python.patch"
-)
-
-hpx_memory_requirement() {
-	# HPX needs enough main memory for compiling
-	# rule of thumb: 1G per job
-	if [[ -z ${MAKEOPTS} ]] ; then
-		echo "2G"
-	else
-		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-		echo "${jobs}G"
-	fi
-}
-
-pkg_pretend() {
-	local CHECKREQS_MEMORY=$(hpx_memory_requirement)
-	check-reqs_pkg_setup
-}
-
-pkg_setup() {
-	local CHECKREQS_MEMORY=$(hpx_memory_requirement)
-	check-reqs_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHPX_WITH_EXAMPLES=OFF
-		-DHPX_WITH_DOCUMENTATION=$(usex doc)
-		-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
-		-DHPX_WITH_PAPI=$(usex papi)
-		-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
-		-DBUILD_TESTING=$(usex test)
-	)
-	if use jemalloc; then
-		mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
-	elif use perftools; then
-		mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc )
-	elif use tbb; then
-		mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc )
-	else
-		mycmakeargs+=( -DHPX_WITH_MALLOC=system )
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use test && cmake_build tests
-}
-
-src_test() {
-	# avoid over-suscribing
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-	use examples && dodoc -r examples/
-	python_fix_shebang "${ED}"
-}