[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-972-g9b73251

[Brad King]

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  9b73251ba80778b7e4c97dabe549e285d478d7b3 (commit)
       via  fb5c12d8d3a4a653854f42c15a6a170a5b5e1261 (commit)
       via  cad56c165456a71b2d078bf562f072ce703499f2 (commit)
      from  b976c491833cbe263ff972624650087253b2aa30 (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=9b73251ba80778b7e4c97dabe549e285d478d7b3
commit 9b73251ba80778b7e4c97dabe549e285d478d7b3
Merge: b976c49 fb5c12d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:08:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 09:08:21 2015 -0400

    Merge topic 'update-libarchive' into next
    
    fb5c12d8 libarchive: Drop use of pthread.h for CMake build
    cad56c16 libarchive: Do not use pthread.h API without header


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb5c12d8d3a4a653854f42c15a6a170a5b5e1261
commit fb5c12d8d3a4a653854f42c15a6a170a5b5e1261
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:07:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 09:07:18 2015 -0400

    libarchive: Drop use of pthread.h for CMake build
    
    CMake does not use threads so we do not need this in our libarchive.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 6b13c2f..00550e2 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -94,6 +94,8 @@ IF(WIN32)
   SET(_WIN32_WINNT ${WINVER})
 ENDIF(WIN32)
 
+set(HAVE_PTHREAD_H 0) # no threads in CMake
+
 IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(HP-UX)$")
   ADD_DEFINITIONS(-D_XOPEN_SOURCE=500) # Ask wchar.h for mbstate_t
 ENDIF()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad56c165456a71b2d078bf562f072ce703499f2
commit cad56c165456a71b2d078bf562f072ce703499f2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 09:04:44 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 09:05:04 2015 -0400

    libarchive: Do not use pthread.h API without header

diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index f4d4254..a20b9b1 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -142,11 +142,10 @@ struct arc4_stream {
 	uint8_t s[256];
 };
 
-static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-
 #define	RANDOMDEV	"/dev/urandom"
 #define	KEYSIZE		128
 #ifdef HAVE_PTHREAD_H
+static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
 #define	_ARC4_LOCK()	pthread_mutex_lock(&arc4random_mtx);
 #define	_ARC4_UNLOCK()  pthread_mutex_unlock(&arc4random_mtx);
 #else

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

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt              |    2 ++
 Utilities/cmlibarchive/libarchive/archive_random.c |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake