On Fri, Apr 24, 2020, at 09:00 CDT, Victor Eijkhout <[email protected]>
wrote:
> On , 2020Apr22, at 16:46, Matthias Maier
> <[email protected]<mailto:[email protected]>> wrote:
>
> patch -p1 < remove_pthread_workarounds.patch
>
> %% screen output
>
> patching file cmake/configure/configure_1_threads.cmake
> Hunk #1 FAILED at 38.
> Hunk #2 succeeded at 64 (offset -10 lines).
> 1 out of 2 hunks FAILED -- saving rejects to file
> cmake/configure/configure_1_threads.cmake.rej
Ah, this is 9.1.1! Mea Culpa.
You don't need the failing hunk - the snippet of cmake configuration in
question was added after the 9.1.1 release. Nevertheless, I have
attached a new patch for 9.1.1. (the second patch works
without modification)
--
The deal.II project is located at http://www.dealii.org/
For mailing list/forum options, see
https://groups.google.com/d/forum/dealii?hl=en
---
You received this message because you are subscribed to the Google Groups
"deal.II User Group" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/dealii/87y2qllz45.fsf%4043-1.org.
diff --git a/cmake/configure/configure_1_threads.cmake b/cmake/configure/configure_1_threads.cmake
index b4de2cc2cc..d23af9b49f 100644
--- a/cmake/configure/configure_1_threads.cmake
+++ b/cmake/configure/configure_1_threads.cmake
@@ -64,21 +64,6 @@ MACRO(SETUP_THREADING)
MARK_AS_ADVANCED(pthread_LIBRARY)
- #
- # Change -lphtread to -pthread for better compatibility on non linux
- # platforms:
- #
- IF("${CMAKE_THREAD_LIBS_INIT}" MATCHES "-lpthread")
- CHECK_CXX_COMPILER_FLAG("-pthread"
- DEAL_II_HAVE_FLAG_pthread
- )
- IF(DEAL_II_HAVE_FLAG_pthread)
- STRING(REPLACE "-lpthread" "-pthread" CMAKE_THREAD_LIBS_INIT
- "${CMAKE_THREAD_LIBS_INIT}"
- )
- ENDIF()
- ENDIF()
-
ADD_FLAGS(THREADS_LINKER_FLAGS "${CMAKE_THREAD_LIBS_INIT}")
#
