summaryrefslogtreecommitdiff
path: root/sys-cluster/hpx/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-20 10:17:50 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-20 10:17:50 +0100
commit399fa07bfac673a8846466b16c76549e329b55b8 (patch)
tree29af17ef91f1bd986b8e615a96b61db7fad5df14 /sys-cluster/hpx/files
parent388a0747e5972613060d5ca13955b5cd7132533d (diff)
gentoo auto-resync : 20:05:2023 - 10:17:50
Diffstat (limited to 'sys-cluster/hpx/files')
-rw-r--r--sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch47
-rw-r--r--sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch16
-rw-r--r--sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch25
-rw-r--r--sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch18
4 files changed, 0 insertions, 106 deletions
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
-