| 1 |
commit: 65187c84488d7759ccd0be31071d3425efc02a6e |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 27 10:06:07 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 27 10:06:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65187c84 |
| 7 |
|
| 8 |
dev-util/cmake: Replaced pthread patch with official upstream fix. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-util/cmake/cmake-3.11.0_rc1.ebuild | 2 +- |
| 13 |
.../cmake-3.11.0_rc1-add_missing_pthread.patch | 21 ----------- |
| 14 |
.../files/cmake-3.11.0_rc1-system_thread.patch | 44 ++++++++++++++++++++++ |
| 15 |
3 files changed, 45 insertions(+), 22 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/cmake-3.11.0_rc1.ebuild b/dev-util/cmake/cmake-3.11.0_rc1.ebuild |
| 18 |
index a1fdde41672..85d191ee0dc 100644 |
| 19 |
--- a/dev-util/cmake/cmake-3.11.0_rc1.ebuild |
| 20 |
+++ b/dev-util/cmake/cmake-3.11.0_rc1.ebuild |
| 21 |
@@ -60,9 +60,9 @@ PATCHES=( |
| 22 |
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 23 |
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
| 24 |
|
| 25 |
- "${FILESDIR}"/${PN}-3.11.0_rc1-add_missing_pthread.patch |
| 26 |
|
| 27 |
# upstream fixes (can usually be removed with a version bump) |
| 28 |
+ "${FILESDIR}"/${PN}-3.11.0_rc1-system_thread.patch |
| 29 |
) |
| 30 |
|
| 31 |
cmake_src_bootstrap() { |
| 32 |
|
| 33 |
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch b/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch |
| 34 |
deleted file mode 100644 |
| 35 |
index 3a4c4352c6f..00000000000 |
| 36 |
--- a/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,21 +0,0 @@ |
| 39 |
---- cmake-3.11.0-rc1/Source/CMakeLists.txt |
| 40 |
-+++ cmake-3.11.0-rc1/Source/CMakeLists.txt |
| 41 |
-@@ -765,6 +765,7 @@ |
| 42 |
- ${CMAKE_LIBUV_LIBRARIES} |
| 43 |
- ${CMAKE_LIBRHASH_LIBRARIES} |
| 44 |
- ${CMake_KWIML_LIBRARIES} |
| 45 |
-+ pthread |
| 46 |
- ) |
| 47 |
- |
| 48 |
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") |
| 49 |
---- cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt |
| 50 |
-+++ cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt |
| 51 |
-@@ -30,7 +30,7 @@ |
| 52 |
- |
| 53 |
- create_test_sourcelist(CMakeLib_TEST_SRCS CMakeLibTests.cxx ${CMakeLib_TESTS}) |
| 54 |
- add_executable(CMakeLibTests ${CMakeLib_TEST_SRCS}) |
| 55 |
--target_link_libraries(CMakeLibTests CMakeLib) |
| 56 |
-+target_link_libraries(CMakeLibTests CMakeLib pthread) |
| 57 |
- |
| 58 |
- set_property(TARGET CMakeLibTests PROPERTY C_CLANG_TIDY "") |
| 59 |
- set_property(TARGET CMakeLibTests PROPERTY CXX_CLANG_TIDY "") |
| 60 |
|
| 61 |
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch b/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch |
| 62 |
new file mode 100644 |
| 63 |
index 00000000000..b2ac2be99d4 |
| 64 |
--- /dev/null |
| 65 |
+++ b/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch |
| 66 |
@@ -0,0 +1,44 @@ |
| 67 |
+From 94eee5e683b80e0ffd8e0c4fd3a45b03f0f37b18 Mon Sep 17 00:00:00 2001 |
| 68 |
+From: Brad King <brad.king@×××××××.com> |
| 69 |
+Date: Thu, 22 Feb 2018 12:57:29 -0500 |
| 70 |
+Subject: [PATCH] CMakeLib: Link to system thread libraries to support std::thread |
| 71 |
+ |
| 72 |
+Some environments require linking to thread libraries for `std::thread`. |
| 73 |
+Express this direct dependency of CMakeLib explicitly. Previously this |
| 74 |
+was done indirectly through our bundled libuv, but that does not work |
| 75 |
+when using a system libuv. |
| 76 |
+ |
| 77 |
+Fixes: #17757 |
| 78 |
+--- |
| 79 |
+ CMakeLists.txt | 2 ++ |
| 80 |
+ Source/CMakeLists.txt | 1 + |
| 81 |
+ 2 files changed, 3 insertions(+) |
| 82 |
+ |
| 83 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 84 |
+index e4d2a9a..6623959 100644 |
| 85 |
+--- a/CMakeLists.txt |
| 86 |
++++ b/CMakeLists.txt |
| 87 |
+@@ -310,6 +310,8 @@ endmacro() |
| 88 |
+ # Simply to improve readability of the main script. |
| 89 |
+ #----------------------------------------------------------------------- |
| 90 |
+ macro (CMAKE_BUILD_UTILITIES) |
| 91 |
++ find_package(Threads) |
| 92 |
++ |
| 93 |
+ #--------------------------------------------------------------------- |
| 94 |
+ # Create the kwsys library for CMake. |
| 95 |
+ set(KWSYS_NAMESPACE cmsys) |
| 96 |
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt |
| 97 |
+index e7c0732..a0010a2 100644 |
| 98 |
+--- a/Source/CMakeLists.txt |
| 99 |
++++ b/Source/CMakeLists.txt |
| 100 |
+@@ -765,6 +765,7 @@ target_link_libraries(CMakeLib cmsys |
| 101 |
+ ${CMAKE_LIBUV_LIBRARIES} |
| 102 |
+ ${CMAKE_LIBRHASH_LIBRARIES} |
| 103 |
+ ${CMake_KWIML_LIBRARIES} |
| 104 |
++ ${CMAKE_THREAD_LIBS_INIT} |
| 105 |
+ ) |
| 106 |
+ |
| 107 |
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") |
| 108 |
+-- |
| 109 |
+libgit2 0.26.0 |
| 110 |
+ |
Archives