[Cmake-commits] CMake branch, next, updated. v2.8.7-2554-gc545412

[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  c545412afaf6f28bcb9e9dd31d96dcd9e27ff5fc (commit)
       via  ca7790240cf63cd6f449cbde2d8b9866bd22c7d8 (commit)
      from  bc679d042c6079d41abdbd26c6ee5107f7b3b527 (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=c545412afaf6f28bcb9e9dd31d96dcd9e27ff5fc
commit c545412afaf6f28bcb9e9dd31d96dcd9e27ff5fc
Merge: bc679d0 ca77902
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 10 15:18:17 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 10 15:18:17 2012 -0500

    Merge topic 'libarchive-old-glibc' into next
    
    ca77902 libarchive: Workaround mbsnrtowcs assertion failure on old glibc


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca7790240cf63cd6f449cbde2d8b9866bd22c7d8
commit ca7790240cf63cd6f449cbde2d8b9866bd22c7d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 10 15:16:06 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 10 15:16:06 2012 -0500

    libarchive: Workaround mbsnrtowcs assertion failure on old glibc
    
    The CMake TarTest fails with the error
    
     mbsnrtowcs.c:116: __mbsnrtowcs: Assertion
      `status == GCONV_OK || status != GCONV_EMPTY_INPUT ||
       status == GCONV_ILLEGAL_INPUT || status == GCONV_INCOMPLETE_INPUT ||
       status == GCONV_FULL_OUTPUT' failed.
    
    on very old glibc versions.  Work around the problem by pretending that
    mbsnrtowcs does not exist.  Libarchive will fall back to mbrtowc.

diff --git a/Utilities/cmlibarchive/libarchive/archive_platform.h b/Utilities/cmlibarchive/libarchive/archive_platform.h
index ce2f482..cdd9c7c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_platform.h
+++ b/Utilities/cmlibarchive/libarchive/archive_platform.h
@@ -76,6 +76,11 @@
 #define	__FBSDID(a)     struct _undefined_hack
 #endif
 
+/* Old glibc mbsnrtowcs fails assertions in our use case.  */
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1
+# undef HAVE_MBSNRTOWCS
+#endif
+
 /* Try to get standard C99-style integer type definitions. */
 #if HAVE_INTTYPES_H
 #include <inttypes.h>

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

Summary of changes:
 .../cmlibarchive/libarchive/archive_platform.h     |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake