Fix boost build failures on newer glibc
This commit is contained in:
parent
30b3cd3b44
commit
415d662ec0
@ -310,6 +310,10 @@ def libs(self):
|
|||||||
when="@1.77.0",
|
when="@1.77.0",
|
||||||
working_dir="tools/build")
|
working_dir="tools/build")
|
||||||
|
|
||||||
|
# Fix issues with PTHREAD_STACK_MIN not being a DEFINED constant in newer glibc
|
||||||
|
# See https:://github.com/spack/spack/issues/28273
|
||||||
|
patch("pthread-stack-min-fix.patch", when="@1.69.0:1.73.0")
|
||||||
|
|
||||||
def patch(self):
|
def patch(self):
|
||||||
# Disable SSSE3 and AVX2 when using the NVIDIA compiler
|
# Disable SSSE3 and AVX2 when using the NVIDIA compiler
|
||||||
if self.spec.satisfies('%nvhpc'):
|
if self.spec.satisfies('%nvhpc'):
|
||||||
|
@ -0,0 +1,15 @@
|
|||||||
|
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;
|
Loading…
Reference in New Issue
Block a user