diff options
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/Manifest.gz | bin | 11545 -> 11548 bytes | |||
-rw-r--r-- | sys-cluster/hpx/Manifest | 12 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch | 47 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch | 16 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch | 25 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch | 18 | ||||
-rw-r--r-- | sys-cluster/hpx/hpx-1.8.0.ebuild | 108 | ||||
-rw-r--r-- | sys-cluster/hpx/hpx-1.9.0.ebuild (renamed from sys-cluster/hpx/hpx-1.8.1.ebuild) | 5 | ||||
-rw-r--r-- | sys-cluster/hpx/hpx-9999.ebuild | 4 |
9 files changed, 7 insertions, 228 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex e01c372a1989..4dea44679c25 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index ec9605355255..522531ffc708 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,11 +1,5 @@ -AUX hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch 1456 BLAKE2B 83026795fc6c8c8dce453c9069041bc6bc18866514de00edecbd14d75588a9ffe3d16d58478e83b989ddbc36f69ae451b3f043fd68ef6d16b2e32d1795c63a93 SHA512 dbf142b1d3741712fb14b47f7667ff76c03ecb21fa60e6ad0e3b312228af63653c11c63156eaf079ba818e280b885fe14cac9bf5095a8c8f3a0567c4be2cfc2e -AUX hpx-1.8.0-fix-musl-execinfo.patch 558 BLAKE2B 9fb0acf6a7045a5f2f88fa545a9e85f99171c427bc943998518c6c7d412d9efa0728b2efd6d2d99d58f64d9937ed3c0e0446a1232944186c430ec9b0e6f9218c SHA512 eacb4ff7e886fb01975fd3e47bf2cc9181609cdb81058fb4526e73314ab0be0f4761773ad31c12de88ce1a49af18862fe6afd4146ebd6f995fac91c26e5367cc -AUX hpx-1.8.0-fix-musl-rtdl-not-declared.patch 1110 BLAKE2B ccbdc1592b5b8a6fdc44c739805bbcf9ecb6acae5af7681a1fcfd9c483af60640b737b06aacfdaa6003121ced80ade8250747dbc33fe251999cbef72ecf68f25 SHA512 2d1558237bff3d4bbc21424d0415dc9d59ad01e14c5f38f59b28ed1fbbb60898cf8cc092efc049eebf4232f3fac2dda976a223c14a2d3778978336f620b25de9 AUX hpx-1.8.0-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b -AUX hpx-1.8.1-fix-intmax-error.patch 543 BLAKE2B 1f5ff2399f1cf842ab79cbf67fe117e4f45e50f2316e598f8778977f4f5bebeb9ebfea04c223697d24b87bb8ef13528a0151e215be0cd4df9769c0c79dff718a SHA512 e4976d0440977d6114b98980c17d272e9876601cca89e32dd27cf467cf2bf4b58817b5bb567bcb71c88b4a3a4da87198341eeb37bc71e922102fd9ca123a2e5f -DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7 -DIST hpx-1.8.1.tar.gz 5242024 BLAKE2B 0a08c004573cf2bebff4042f859fa457bd821bd55b58aa0e0e56dfc8b80378469c24daa94789196d9486a3321598031a0930306e2e76c311b6fd8179e9bc61a1 SHA512 af2471a04dd0a3c414907ed06661ab1c6f6a49cc09d1ed3ae5d5587ca365270797a1d2ce9d0320dc7d7f9ff2c6d29037c7fbb84fa6d9c0033628ba7036f12986 -EBUILD hpx-1.8.0.ebuild 2440 BLAKE2B 4616039e4c35375095f551e11acd5988b2da70eeb5ce73644be269b9e245f85b61c794b05727870c3823ee7c4077ba45b85efe6c642dbd9df5cad92c012fd999 SHA512 0609ec72a3163ade6ef41e1dfb001fb664d4164b3765cfcce02b4e7c84acce89d60a942fdd32dee9bb4852eb6cecc22b5645139ee7519ee3478f7724c4c91d75 -EBUILD hpx-1.8.1.ebuild 2339 BLAKE2B a7f34a1cc84fd08132361c0693d0cda6b1cd73ad9931f4e550c2833bf33a6c08bb6e947fb10a4277ad593e39e585552b076a3520ce9aea8d92255de3ee3d88f9 SHA512 1cf89652c2c3ff679bf732ce4af209ff44fa2b404579757c4deba4c54f5e9e8dbe74046736c9fa896f946c6aecdbab6a60179d47eed978283b4bcc38ccf57839 -EBUILD hpx-9999.ebuild 2236 BLAKE2B 3eb158dba349d0d30d063c7f3e5476b2600e3e4d36c106d1fb843d3590dbdbeaac15cab57cea260ccfb793f0c6c296480244f36f1ef9b422084fe2d6857e7303 SHA512 3f99932b086777d14dd90129dceef77c7b8baf88967336b86df1e3ea4ec562f5b4327d53cc4daaab145b62986dedf512884c8cb4aff76590f1b7fa5002b447d7 +DIST hpx-1.9.0.tar.gz 5648944 BLAKE2B 642fa16e97954973715bbd87b242b1f7ed13c64dfcffb00f50d7826dd114b3908a350b87508b9b6fde66df8fd772ae1b501f209bc200e3331312c0cc4ab88e80 SHA512 a9b55999e0d9f79433a44f0f7f21340e947fa0ba354ecb007340664a0f4820be1f7723075d18775a395a455648bbb4bff85061e6f7ad4b551b93943e845d4443 +EBUILD hpx-1.9.0.ebuild 2291 BLAKE2B 87edc7a82cea23be19e7257fe8522b45c83ce3f2a2ee525b4a70af92b2e81a1d47c844d94cf6b048e37d4e61cafb25bff51857a49053214581bb60e0c0dfbfb2 SHA512 d363831d6edd967fafaca3c3759085462fc2ffa13191c36bb3477f9981d6d7add4b3c1c816db387306eb7808f53bade184d9a11c1adecc38211f59cfa7a62309 +EBUILD hpx-9999.ebuild 2238 BLAKE2B 8892a7597254221ebd4295882c5a937940ac668af53f465485e7b63721558df5e5ece99c5a1b1dcdc05bc1a6b3df011a34f425b4fcddd1fbc189e3564d5b73ae SHA512 b863ae65c64919190dc4d9452cff74d08b9ff15920d8182cc40df577abbd505c8fa584c128838da6701ba142d6e2f46a07ac1905cc6a8082b683b1648b51ed41 MISC metadata.xml 1220 BLAKE2B a5837e65f59f895e5680cdcb7e82d6ef775d36300e86bd3b180f223ef4516278a9af17f361e2e55c10b42544c134cc1b7d677d46d20d0e400169fcb4b863d22d SHA512 62ff93d5e85b160d042e55c16a1755937dc85e93ab7c25b96d4ae90da099582e1b7a741d3588e8446fe45c354f0d9b8f7589cebcf999b07a64906d71c79474a3 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 <jwakely@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.9.0.ebuild index a875850567d3..2418f19d261f 100644 --- a/sys-cluster/hpx/hpx-1.8.1.ebuild +++ b/sys-cluster/hpx/hpx-1.9.0.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..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" + SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi inherit check-reqs cmake multiprocessing python-single-r1 @@ -47,7 +47,6 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-1.8.0-python.patch" - "${FILESDIR}/${PN}-1.8.1-fix-intmax-error.patch" ) hpx_memory_requirement() { diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index 778f55f4d27a..fef4b1933ee7 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..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" + SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi inherit check-reqs cmake multiprocessing python-single-r1 |