mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-16 10:43:27 +00:00
f363b7c5df
To quote the release-notes[1]: > When _DYNAMIC_STACK_SIZE_SOURCE or _GNU_SOURCE are defined, > PTHREAD_STACK_MIN is no longer constant and is redefined to > sysconf(_SC_THREAD_STACK_MIN). This supports dynamic sized register > sets for modern architectural features like Arm SVE. This basically means that if the above applies, `#if PTHREAD_STACK_MIN > 0` won't compile anymore because `PTHREAD_STACK_MIN` isn't a hard-coded number, but `__sysconf (__SC_THREAD_STACK_MIN_VALUE)`[2]. The issue (for 1.69, 1.70, 1.72 - the other versions seem OK) was reported upstream, but only for Solaris[3], however the corresponding patches[4] seem to work as well for us. Failing Hydra build: https://hydra.nixos.org/build/150926294 [1] https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html [2] See `${pkgs.glibc.dev}/include/bits/pthread_stack_min-dynamic.h` [3] https://github.com/boostorg/thread/issues/283 [4] https://github.com/conan-io/conan-center-index/pull/361
16 lines
589 B
Diff
16 lines
589 B
Diff
Taken from https://github.com/conan-io/conan-center-index/pull/361/files
|
|
|
|
diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
|
|
index aefbeb4..bc9b136 100644
|
|
--- a/boost/thread/pthread/thread_data.hpp
|
|
+++ b/boost/thread/pthread/thread_data.hpp
|
|
@@ -57,7 +57,7 @@ namespace boost
|
|
#else
|
|
std::size_t page_size = ::sysconf( _SC_PAGESIZE);
|
|
#endif
|
|
-#if PTHREAD_STACK_MIN > 0
|
|
+#ifdef PTHREAD_STACK_MIN
|
|
if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
|
|
#endif
|
|
size = ((size+page_size-1)/page_size)*page_size;
|