unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 4f5ae5add64dc9cf58ed78eb9fe4e1bcb11ef653 1077 bytes (raw)
name: gnu/packages/patches/cmake-3.11-pthread-fix.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
 
Fix pthread link failure when using system libuv.

Copied from upstream source repository:
https://gitlab.kitware.com/cmake/cmake/commit/94eee5e683b80e0ffd8e0c4fd3a45b03f0f37b18

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4d2a9a0a2..66239595ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -310,6 +310,8 @@ endmacro()
 # Simply to improve readability of the main script.
 #-----------------------------------------------------------------------
 macro (CMAKE_BUILD_UTILITIES)
+  find_package(Threads)
+
   #---------------------------------------------------------------------
   # Create the kwsys library for CMake.
   set(KWSYS_NAMESPACE cmsys)
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index e7c0732675..a0010a292b 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -765,6 +765,7 @@ target_link_libraries(CMakeLib cmsys
   ${CMAKE_LIBUV_LIBRARIES}
   ${CMAKE_LIBRHASH_LIBRARIES}
   ${CMake_KWIML_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT}
   )
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")

debug log:

solving 4f5ae5add ...
found 4f5ae5add in https://yhetil.org/guix-patches/20180224190349.8155-5-mbakke@fastmail.com/

applying [1/1] https://yhetil.org/guix-patches/20180224190349.8155-5-mbakke@fastmail.com/
diff --git a/gnu/packages/patches/cmake-3.11-pthread-fix.patch b/gnu/packages/patches/cmake-3.11-pthread-fix.patch
new file mode 100644
index 000000000..4f5ae5add

1:35: trailing whitespace.
 
Checking patch gnu/packages/patches/cmake-3.11-pthread-fix.patch...
Applied patch gnu/packages/patches/cmake-3.11-pthread-fix.patch cleanly.
warning: 1 line adds whitespace errors.

index at:
100644 4f5ae5add64dc9cf58ed78eb9fe4e1bcb11ef653	gnu/packages/patches/cmake-3.11-pthread-fix.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).