gentoo resync : 09.07.2022

5 files changed, 95 insertions, 1 deletions

diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index fbe26cedc933..85b5b21bb638 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,5 +1,8 @@
+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
 DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7
-EBUILD hpx-1.8.0.ebuild 2282 BLAKE2B 476428179a09f9255e5681de06834e016e7a090beb87c9d517c363ab03465e6aae2036dff9ca028a1c327c4a4a6ce71bbd0d514dcf675d0de20055177aa07e56 SHA512 2e37ed82a434a14bcd3fbe6b9a46f555cd5b2bb20654ed7558048d496884e329f4a76eb8a1164a74d3a8c769de606162d5234431d031122c7526ebeb8515e825
+EBUILD hpx-1.8.0.ebuild 2440 BLAKE2B 4b436f6ea76d03b748a92330ac8c18cff6c25730b5fd4144e8ca17235fd574a1758082d70ca73d40ff95132ce0a67b070c65d33a0c94447ee5f10057322c60a1 SHA512 34618fdc3f7cd3dc32ab98db4166c2039b179478cc7cf637db6209af90ad2a96b51000dec6ad71bc2051322252fd3777aff4e86a216abd1489c9b5dbbaf350b6
 EBUILD hpx-9999.ebuild 2236 BLAKE2B 49029b81775c6cbcf4afd8affbf814e4676288ef806ae3ab4585ce098e5251b2fa2a982f73ec678ca08b7168f3b18fdcecaffde446c38a87ab3b03b61c3628bc SHA512 a1f18c99c3c6eef1fc4740e83af7f1ddc079deb3e10c5bec26386bfaa9e4f0db522b611f79ce5281ab0ee05f43c789401b7169488d6c9cf76394734a49157563
 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
new file mode 100644
index 000000000000..d2e54b9df256
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch
@@ -0,0 +1,47 @@
+# 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
new file mode 100644
index 000000000000..4c82ca3f6be1
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch
@@ -0,0 +1,16 @@
+# 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
new file mode 100644
index 000000000000..0264aeab52f5
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch
@@ -0,0 +1,25 @@
+# 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/hpx-1.8.0.ebuild b/sys-cluster/hpx/hpx-1.8.0.ebuild
index a1b86f1f953f..118e080a1120 100644
--- a/sys-cluster/hpx/hpx-1.8.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.8.0.ebuild
@@ -47,6 +47,9 @@ 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() {