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 bb9cb067bf94bbefd209a71816c2489111694e08 (commit) via cf5ad18340f1d775e47c7aa9afde7deb0482027e (commit) from e6e176821389f1e97c9badadab1c8225bae40fff (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=bb9cb067bf94bbefd209a71816c2489111694e08 commit bb9cb067bf94bbefd209a71816c2489111694e08 Merge: e6e1768 cf5ad18 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Jan 12 13:56:13 2011 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jan 12 13:56:13 2011 -0500 Merge topic 'linux-standard-base' into next cf5ad18 libarchive: Fix major() check for LSB 4.0 (#11648) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf5ad18340f1d775e47c7aa9afde7deb0482027e commit cf5ad18340f1d775e47c7aa9afde7deb0482027e Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Jan 12 13:52:14 2011 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Jan 12 13:52:14 2011 -0500 libarchive: Fix major() check for LSB 4.0 (#11648) The LSB header files define major() as a macro but if it is ever called the macro references symbols not available at link time. Improve the test for major() to actually call the macro and try to link. This approach is based on upstream libarchive SVN commit 2866 which fixed libarchive issue 125, submitted in response to CMake issue #11648. Inspired-by: Tim Kientzle <kient...@freebsd.org> diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index 8c10b21..6472ec5 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -415,8 +415,12 @@ CHECK_SYMBOL_EXISTS(strerror_r "string.h" HAVE_STRERROR_R) CHECK_SYMBOL_EXISTS(strftime "time.h" HAVE_STRFTIME) CHECK_SYMBOL_EXISTS(vprintf "stdio.h" HAVE_VPRINTF) -CHECK_SYMBOL_EXISTS(major "sys/mkdev.h" MAJOR_IN_MKDEV) -CHECK_SYMBOL_EXISTS(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) +CHECK_C_SOURCE_COMPILES( + "#include <sys/mkdev.h>\nint main() { return major(256); }" + MAJOR_IN_MKDEV) +CHECK_C_SOURCE_COMPILES( + "#include <sys/sysmacros.h>\nint main() { return major(256); }" + MAJOR_IN_SYSMACROS) IF(HAVE_STRERROR_R) SET(HAVE_DECL_STRERROR_R 1) ----------------------------------------------------------------------- Summary of changes: Utilities/cmlibarchive/CMakeLists.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits