[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-568-g316aa77

Brad King brad.king at kitware.com
Sun Feb 26 10:49:02 EST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  316aa77eea2dff8e982257904344c46336673fce (commit)
       via  4f2650d5a96e0c1c6a29597bf891909681349b80 (commit)
       via  c9b3c5625a4b35235bfe19e95db8e7d0dfbde59c (commit)
       via  f06986926ae2ed76023956e6594711f9e65b4106 (commit)
       via  5651257fffc4482861c2ed6a67721fd00f0da6c0 (commit)
      from  4f36d8840546f9722b223b72424d404a84eb95a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=316aa77eea2dff8e982257904344c46336673fce
commit 316aa77eea2dff8e982257904344c46336673fce
Merge: 4f36d88 4f2650d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 26 10:49:01 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 26 10:49:01 2017 -0500

    Merge topic 'libuv-solaris-10' into next
    
    4f2650d5 Enable libuv on Solaris 10
    c9b3c562 libuv: Link to 'rt' library on Solaris 10 to get semaphores
    f0698692 libuv: Implement mkdtemp on Solaris 10
    5651257f libuv: automatically skip ifaddrs on Solaris 10


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f2650d5a96e0c1c6a29597bf891909681349b80
commit 4f2650d5a96e0c1c6a29597bf891909681349b80
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 19:45:48 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 26 10:48:27 2017 -0500

    Enable libuv on Solaris 10
    
    We've ported our libuv to this platform so we can build it now.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e613224..472c6ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -509,12 +509,6 @@ int main(void) { return 0; }
     elseif(CMAKE_SYSTEM_NAME STREQUAL "HP-UX")
       # Disable until it can be ported.
       set(CMAKE_USE_LIBUV 0)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
-      # Disable until it can be ported.
-      set(CMAKE_USE_LIBUV 0)
-    elseif(CMAKE_SYSTEM STREQUAL "SunOS-5.10")
-      # Disable until it can be ported.
-      set(CMAKE_USE_LIBUV 0)
     endif()
   endif()
   if(CMAKE_USE_LIBUV)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9b3c5625a4b35235bfe19e95db8e7d0dfbde59c
commit c9b3c5625a4b35235bfe19e95db8e7d0dfbde59c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 19:45:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 26 10:48:26 2017 -0500

    libuv: Link to 'rt' library on Solaris 10 to get semaphores

diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index a8e25ba..1899f83 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -212,6 +212,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
     nsl
     sendfile
     socket
+    rt
     )
   list(APPEND uv_headers
     include/uv-sunos.h

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f06986926ae2ed76023956e6594711f9e65b4106
commit f06986926ae2ed76023956e6594711f9e65b4106
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 19:44:53 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 26 10:48:26 2017 -0500

    libuv: Implement mkdtemp on Solaris 10

diff --git a/Utilities/cmlibuv/src/unix/fs.c b/Utilities/cmlibuv/src/unix/fs.c
index f9513ea..8a4ba7a 100644
--- a/Utilities/cmlibuv/src/unix/fs.c
+++ b/Utilities/cmlibuv/src/unix/fs.c
@@ -244,9 +244,19 @@ skip:
 #endif
 }
 
+#if defined(__sun) && _XOPEN_SOURCE < 600
+static char* uv__mkdtemp(char *template)
+{
+  if (!mktemp(template) || mkdir(template, 0700))
+    return NULL;
+  return template;
+}
+#else
+#define uv__mkdtemp mkdtemp
+#endif
 
 static ssize_t uv__fs_mkdtemp(uv_fs_t* req) {
-  return mkdtemp((char*) req->path) ? 0 : -1;
+  return uv__mkdtemp((char*) req->path) ? 0 : -1;
 }
 
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5651257fffc4482861c2ed6a67721fd00f0da6c0
commit 5651257fffc4482861c2ed6a67721fd00f0da6c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 19:44:19 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 26 10:48:26 2017 -0500

    libuv: automatically skip ifaddrs on Solaris 10

diff --git a/Utilities/cmlibuv/src/unix/sunos.c b/Utilities/cmlibuv/src/unix/sunos.c
index a43f7f1..14c58af 100644
--- a/Utilities/cmlibuv/src/unix/sunos.c
+++ b/Utilities/cmlibuv/src/unix/sunos.c
@@ -28,6 +28,10 @@
 #include <assert.h>
 #include <errno.h>
 
+#if !defined(SUNOS_NO_IFADDRS) && _XOPEN_SOURCE < 600
+#define SUNOS_NO_IFADDRS
+#endif
+
 #ifndef SUNOS_NO_IFADDRS
 # include <ifaddrs.h>
 #endif

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                     |    6 ------
 Utilities/cmlibuv/CMakeLists.txt   |    1 +
 Utilities/cmlibuv/src/unix/fs.c    |   12 +++++++++++-
 Utilities/cmlibuv/src/unix/sunos.c |    4 ++++
 4 files changed, 16 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list