commit: 9a291784febe71a86632162508d54a563e09c72d Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de> AuthorDate: Thu May 18 09:49:49 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 20 06:27:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a291784
sys-cluster/hpx: drop 1.8.0, 1.8.1 Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de> Closes: https://github.com/gentoo/gentoo/pull/31082 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-cluster/hpx/Manifest | 2 - ...-1.8.0-fix-musl-exec_pagesize-not-defined.patch | 47 --------- .../hpx/files/hpx-1.8.0-fix-musl-execinfo.patch | 16 --- .../hpx-1.8.0-fix-musl-rtdl-not-declared.patch | 25 ----- .../hpx/files/hpx-1.8.1-fix-intmax-error.patch | 18 ---- sys-cluster/hpx/hpx-1.8.0.ebuild | 108 --------------------- sys-cluster/hpx/hpx-1.8.1.ebuild | 106 -------------------- 7 files changed, 322 deletions(-) diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index 53574bf4e9f4..3b21b3bb03e4 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,3 +1 @@ -DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7 -DIST hpx-1.8.1.tar.gz 5242024 BLAKE2B 0a08c004573cf2bebff4042f859fa457bd821bd55b58aa0e0e56dfc8b80378469c24daa94789196d9486a3321598031a0930306e2e76c311b6fd8179e9bc61a1 SHA512 af2471a04dd0a3c414907ed06661ab1c6f6a49cc09d1ed3ae5d5587ca365270797a1d2ce9d0320dc7d7f9ff2c6d29037c7fbb84fa6d9c0033628ba7036f12986 DIST hpx-1.9.0.tar.gz 5648944 BLAKE2B 642fa16e97954973715bbd87b242b1f7ed13c64dfcffb00f50d7826dd114b3908a350b87508b9b6fde66df8fd772ae1b501f209bc200e3331312c0cc4ab88e80 SHA512 a9b55999e0d9f79433a44f0f7f21340e947fa0ba354ecb007340664a0f4820be1f7723075d18775a395a455648bbb4bff85061e6f7ad4b551b93943e845d4443 diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch deleted file mode 100644 index d2e54b9df256..000000000000 --- a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch +++ /dev/null @@ -1,47 +0,0 @@ -# EXEC_PAGESIZE is a preprocessor macro from the Linux Kernel headers. Include -# the appropriate Linux header file <linux/param.h> -# -# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from -# 1.8.1 we can drop these patches ---- a/components/performance_counters/memory/src/mem_counter_linux.cpp -+++ b/components/performance_counters/memory/src/mem_counter_linux.cpp -@@ -14,6 +14,11 @@ - #include <sys/types.h> - #include <unistd.h> - -+// Fix for musl. Use linux/param.h for EXEC_PAGESIZE -+#ifdef __linux__ -+#include <linux/param.h> -+#endif -+ - #include <hpx/modules/errors.hpp> - #include <hpx/modules/format.hpp> - ---- a/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp -+++ b/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp -@@ -37,6 +37,11 @@ - #include <stdexcept> - #include <sys/param.h> - -+// Fix for musl. Use linux/param.h for EXEC_PAGESIZE -+#ifdef __linux__ -+#include <linux/param.h> -+#endif -+ - #if defined(HPX_HAVE_STACKOVERFLOW_DETECTION) - - #include <cstring> ---- a/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp -+++ b/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp -@@ -67,6 +67,11 @@ - #define EXEC_PAGESIZE static_cast<std::size_t>(sysconf(_SC_PAGESIZE)) - #endif - -+// Fix for musl. Use linux/param.h for EXEC_PAGESIZE -+#ifdef __linux__ -+#include <linux/param.h> -+#endif -+ - /** - * Stack allocation routines and trampolines for setcontext - */ diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch deleted file mode 100644 index 4c82ca3f6be1..000000000000 --- a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch +++ /dev/null @@ -1,16 +0,0 @@ -# Check for execinfo only on glibc and ulibc systems. -# -# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from -# 1.8.1 we can drop these patches ---- a/libs/core/debugging/src/backtrace.cpp -+++ b/libs/core/debugging/src/backtrace.cpp -@@ -19,7 +19,9 @@ - - #if (defined(__linux) || defined(__APPLE__) || defined(__sun)) && \ - (!defined(__ANDROID__) || !defined(ANDROID)) -+#if defined(__GLIBC__) - #define HPX_HAVE_EXECINFO -+#endif - #define HPX_HAVE_DLFCN - #if defined(__GNUC__) && !defined(__clang__) - #define HPX_HAVE_UNWIND diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch deleted file mode 100644 index 0264aeab52f5..000000000000 --- a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch +++ /dev/null @@ -1,25 +0,0 @@ -# RTLD_DI_ORIGIN is not defined in musl as a result hpx fails to build. -# Closes: https://bugs.gentoo.org/829242 -# -# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from -# 1.8.1 we can drop these patches ---- a/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp -+++ b/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp -@@ -319,6 +319,7 @@ namespace hpx { namespace util { namespace plugin { - std::string result; - - #if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__APPLE__) -+#if defined(RTLD_DI_ORIGIN) - char directory[PATH_MAX] = {'\0'}; - const_cast<dll&>(*this).LoadLibrary(ec); - if (!ec && ::dlinfo(dll_handle, RTLD_DI_ORIGIN, directory) < 0) -@@ -333,6 +334,9 @@ namespace hpx { namespace util { namespace plugin { - } - result = directory; - ::dlerror(); // Clear the error state. -+#else -+ result = path(dll_name).parent_path().string(); -+#endif - #elif defined(__APPLE__) - // SO staticfloat's solution - const_cast<dll&>(*this).LoadLibrary(ec); diff --git a/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch b/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch deleted file mode 100644 index 1f5041047a59..000000000000 --- a/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 9ce60348a5401fe58b6fd7333d3d7e19f0d6d8ac Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely <jwak...@redhat.com> -Date: Wed, 8 Feb 2023 12:32:11 +0000 -Subject: [PATCH] Add missing header for std::intmax_t - ---- a/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp -+++ b/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> - --- -2.39.2 - diff --git a/sys-cluster/hpx/hpx-1.8.0.ebuild b/sys-cluster/hpx/hpx-1.8.0.ebuild deleted file mode 100644 index 95f5fe9b725c..000000000000 --- a/sys-cluster/hpx/hpx-1.8.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"; -else - SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi -inherit check-reqs cmake multiprocessing python-single-r1 - -DESCRIPTION="C++ runtime system for parallel and distributed applications" -HOMEPAGE="https://hpx.stellar-group.org/"; - -SLOT="0" -LICENSE="Boost-1.0" -IUSE="examples jemalloc mpi papi +perftools tbb zlib" -# tests fail to compile -RESTRICT="test" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( jemalloc perftools tbb ) -" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/asio-1.12.0 - dev-libs/boost:= - sys-apps/hwloc:= - jemalloc? ( dev-libs/jemalloc:= ) - mpi? ( virtual/mpi ) - papi? ( dev-libs/papi ) - perftools? ( dev-util/google-perftools:= ) - tbb? ( dev-cpp/tbb:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-python.patch" - "${FILESDIR}/${P}-fix-musl-exec_pagesize-not-defined.patch" - "${FILESDIR}/${P}-fix-musl-execinfo.patch" - "${FILESDIR}/${P}-fix-musl-rtdl-not-declared.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=OFF - -DHPX_WITH_PARCELPORT_MPI=$(usex mpi) - -DHPX_WITH_PAPI=$(usex papi) - -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) - -DHPX_WITH_COMPRESSION_ZLIB=$(usex zlib) - -DHPX_WITH_TESTS=OFF - ) - 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 -} - -src_install() { - cmake_src_install - use examples && dodoc -r examples/ - python_fix_shebang "${ED}" -} diff --git a/sys-cluster/hpx/hpx-1.8.1.ebuild b/sys-cluster/hpx/hpx-1.8.1.ebuild deleted file mode 100644 index a875850567d3..000000000000 --- a/sys-cluster/hpx/hpx-1.8.1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git"; -else - SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi -inherit check-reqs cmake multiprocessing python-single-r1 - -DESCRIPTION="C++ runtime system for parallel and distributed applications" -HOMEPAGE="https://hpx.stellar-group.org/"; - -SLOT="0" -LICENSE="Boost-1.0" -IUSE="examples jemalloc mpi papi +perftools tbb zlib" -# tests fail to compile -RESTRICT="test" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( jemalloc perftools tbb ) -" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/asio-1.12.0 - dev-libs/boost:= - sys-apps/hwloc:= - jemalloc? ( dev-libs/jemalloc:= ) - mpi? ( virtual/mpi ) - papi? ( dev-libs/papi ) - perftools? ( dev-util/google-perftools:= ) - tbb? ( dev-cpp/tbb:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-python.patch" - "${FILESDIR}/${PN}-1.8.1-fix-intmax-error.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=OFF - -DHPX_WITH_PARCELPORT_MPI=$(usex mpi) - -DHPX_WITH_PAPI=$(usex papi) - -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) - -DHPX_WITH_COMPRESSION_ZLIB=$(usex zlib) - -DHPX_WITH_TESTS=OFF - ) - 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 -} - -src_install() { - cmake_src_install - use examples && dodoc -r examples/ - python_fix_shebang "${ED}" -}
