[Cmake-commits] CMake branch, next, updated. v2.8.7-1935-g699849d

[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  699849d4ab5c3792330470c0a3c1694be8f73864 (commit)
       via  3a9f4490f43569af145a444593cd091779d198a9 (commit)
       via  6af6b96cb391cd5bf176562c3be51ed3a9d995b1 (commit)
      from  457ae4885128ddc53f8da90d83bd61979ee75854 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=699849d4ab5c3792330470c0a3c1694be8f73864
commit 699849d4ab5c3792330470c0a3c1694be8f73864
Merge: 457ae48 3a9f449
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 3 11:20:42 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 3 11:20:42 2012 -0500

    Merge topic 'update-libarchive' into next
    
    3a9f449 libarchive: Use Apple copyfile.h API only if available
    6af6b96 libarchive: Do not use MNT_NOATIME if not defined


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a9f4490f43569af145a444593cd091779d198a9
commit 3a9f4490f43569af145a444593cd091779d198a9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 3 11:16:32 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 3 11:16:32 2012 -0500

    libarchive: Use Apple copyfile.h API only if available
    
    Do not use the copyfile.h API if the header is not available.
    The Mac SDK for older OS X versions does not provide it.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_disk_entry_from_file.c b/Utilities/cmlibarchive/libarchive/archive_read_disk_entry_from_file.c
index cc39151..8ce88b3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_disk_entry_from_file.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_disk_entry_from_file.c
@@ -246,7 +246,7 @@ archive_read_disk_entry_from_file(struct archive *_a,
 	return (r);
 }
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(HAVE_COPYFILE_H)
 /*
  * The Mac OS "copyfile()" API copies the extended metadata for a
  * file into a separate file in AppleDouble format (see RFC 1740).

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6af6b96cb391cd5bf176562c3be51ed3a9d995b1
commit 6af6b96cb391cd5bf176562c3be51ed3a9d995b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 3 11:15:25 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 3 11:15:25 2012 -0500

    libarchive: Do not use MNT_NOATIME if not defined
    
    Use the same pattern already used elsewhere in archive_read_disk_posix.c
    for ST_NOATIME to use MNT_NOATIME only when defined.

diff --git a/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
index 557b26b..7d7eeca 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c
@@ -1321,9 +1321,11 @@ setup_current_filesystem(struct archive_read_disk *a)
 		t->current_filesystem->synthetic = 0;
 #endif
 
+#if defined(MNT_NOATIME)
 	if (sfs.f_flags & MNT_NOATIME)
 		t->current_filesystem->noatime = 1;
 	else
+#endif
 		t->current_filesystem->noatime = 0;
 
 #if defined(HAVE_READDIR_R)

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

Summary of changes:
 .../libarchive/archive_read_disk_entry_from_file.c |    2 +-
 .../libarchive/archive_read_disk_posix.c           |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake