[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1149-g4e4866a
Brad King
brad.king at kitware.com
Wed Oct 28 08:45:31 EDT 2015
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 4e4866aa7e26a8151683300da019208a9cb06f4a (commit)
via b272a656552682e4042a65089703d6f78043ff18 (commit)
via 87f1f363dfaf181854b81d84518ea57334edcc8f (commit)
via 45cd9e63371ae09b6ad9dbc27ac4d36c19b357af (commit)
via c09acf4fdd961a8ba9a27f9af2800e9262cd18be (commit)
via 2f940f89951027bc596edbe1a5768cc0a0ef78a0 (commit)
via 1e4738173053450c370f6d558fff6c08e5b084f5 (commit)
via 43d577dcb9e29842c91073056ca400963d6bee0e (commit)
from 9783c9d76f4feaa77b4952b99179702195c57484 (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=4e4866aa7e26a8151683300da019208a9cb06f4a
commit 4e4866aa7e26a8151683300da019208a9cb06f4a
Merge: 9783c9d b272a65
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 08:45:30 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 08:45:30 2015 -0400
Merge topic 'update-libarchive' into next
b272a656 cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
87f1f363 cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
45cd9e63 Update libarchive configuration within CMake
c09acf4f libarchive: Update README-CMake.txt for new snapshot
2f940f89 libarchive: Drop use of pthread.h for CMake build
1e473817 libarchive: Do not use pthread.h API without header
43d577dc libarchive: Test for Clang builtin before using it
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b272a656552682e4042a65089703d6f78043ff18
commit b272a656552682e4042a65089703d6f78043ff18
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:56:09 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:48 2015 -0400
cmSystemTools: Preemptively adapt to future libarchive 4.0 changes
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2c5aa8a..b2827dc 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -29,6 +29,9 @@
# include "cmArchiveWrite.h"
# include "cmLocale.h"
# include <cm_libarchive.h>
+# ifndef __LA_INT64_T
+# define __LA_INT64_T la_int64_t
+# endif
#endif
#include <cmsys/FStream.hxx>
#include <cmsys/Terminal.h>
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87f1f363dfaf181854b81d84518ea57334edcc8f
commit 87f1f363dfaf181854b81d84518ea57334edcc8f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 10:37:14 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:48 2015 -0400
cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes
diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 7946950..e62a2ed 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -18,6 +18,10 @@
#include <cm_libarchive.h>
#include "cm_get_date.h"
+#ifndef __LA_SSIZE_T
+# define __LA_SSIZE_T la_ssize_t
+#endif
+
//----------------------------------------------------------------------------
static std::string cm_archive_error_string(struct archive* a)
{
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45cd9e63371ae09b6ad9dbc27ac4d36c19b357af
commit 45cd9e63371ae09b6ad9dbc27ac4d36c19b357af
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:08:30 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:48 2015 -0400
Update libarchive configuration within CMake
Hard-code libarchive build options to the way CMake needs them. Set
them as internal cache entries so users do not see them when building
CMake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96f68b..ebee14b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -372,12 +372,14 @@ macro (CMAKE_BUILD_UTILITIES)
set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found")
set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found")
set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found")
+ set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found libxml2 library if found")
set(ENABLE_EXPAT OFF CACHE INTERNAL "Enable the use of the system found EXPAT library if found")
set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found")
set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found")
set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support")
set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support")
set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support")
+ set(ENABLE_CNG OFF CACHE INTERNAL "Enable the use of CNG(Crypto Next Generation)")
add_subdirectory(Utilities/cmlibarchive)
CMAKE_SET_TARGET_FOLDER(cmlibarchive "Utilities/3rdParty")
set(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c09acf4fdd961a8ba9a27f9af2800e9262cd18be
commit c09acf4fdd961a8ba9a27f9af2800e9262cd18be
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 21 11:21:39 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:47 2015 -0400
libarchive: Update README-CMake.txt for new snapshot
diff --git a/Utilities/cmlibarchive/README-CMake.txt b/Utilities/cmlibarchive/README-CMake.txt
index 8f3b29b..0a3e34a 100644
--- a/Utilities/cmlibarchive/README-CMake.txt
+++ b/Utilities/cmlibarchive/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
Update libarchive from upstream as follows. Create a local branch to
explicitly reference the upstream snapshot branch head:
- git branch libarchive-upstream 37f225b7
+ git branch libarchive-upstream 1a8c7bc2
Use a temporary directory to checkout the branch:
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
Now place the (reduced) libarchive content in this directory. See
instructions shown by
- git log 37f225b7
+ git log 1a8c7bc2
for help extracting the content from the upstream svn repo. Then run
the following commands to commit the new version. Substitute the
@@ -34,8 +34,8 @@ appropriate date and version number:
GIT_AUTHOR_NAME='LibArchive Upstream' \
GIT_AUTHOR_EMAIL='libarchive-discuss at googlegroups.com' \
- GIT_AUTHOR_DATE='Mon Apr 14 19:19:05 2014 -0700' \
- git commit -m 'libarchive 3.1.2-246-ga5a5d28b (reduced)' &&
+ GIT_AUTHOR_DATE='Wed Oct 21 01:47:34 2015 -0700' \
+ git commit -m 'libarchive 3.1.2-601-g3bfe5f1 (reduced)' &&
git commit --amend
Edit the commit message to describe the procedure used to obtain the
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f940f89951027bc596edbe1a5768cc0a0ef78a0
commit 2f940f89951027bc596edbe1a5768cc0a0ef78a0
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: Wed Oct 28 08:44:47 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=1e4738173053450c370f6d558fff6c08e5b084f5
commit 1e4738173053450c370f6d558fff6c08e5b084f5
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: Wed Oct 28 08:44:47 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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43d577dcb9e29842c91073056ca400963d6bee0e
commit 43d577dcb9e29842c91073056ca400963d6bee0e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 23 10:24:47 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 28 08:44:47 2015 -0400
libarchive: Test for Clang builtin before using it
The __builtin_bswap16 builtin is not available on Clang 2.1.
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
index c359d83..eff02d8 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_lha.c
@@ -1712,10 +1712,13 @@ lha_crc16(uint16_t crc, const void *pp, size_t len)
for (;len >= 8; len -= 8) {
/* This if statement expects compiler optimization will
* remove the stament which will not be executed. */
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400 /* Visual Studio */
# define bswap16(x) _byteswap_ushort(x)
#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
- || defined(__clang__)
+ || (defined(__clang__) && __has_builtin(__builtin_bswap16))
# define bswap16(x) __builtin_bswap16(x)
#else
# define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list