[Cmake-commits] CMake branch, next, updated. v3.1.0-1255-gdf2bed8

[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  df2bed8f4d78e241db1664efe44d5e4b389bd62a (commit)
       via  44c6db6eb13b52683ad1b4ce49e6805cff076dfb (commit)
      from  db4b106b69e047a6242623a418999d51919b11c6 (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=df2bed8f4d78e241db1664efe44d5e4b389bd62a
commit df2bed8f4d78e241db1664efe44d5e4b389bd62a
Merge: db4b106 44c6db6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 11:09:22 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 11:09:22 2014 -0500

    Merge topic 'bootstrap-solaris' into next
    
    44c6db6e bootstrap: Fix syntax for Solaris 10 shell (#15317)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44c6db6eb13b52683ad1b4ce49e6805cff076dfb
commit 44c6db6eb13b52683ad1b4ce49e6805cff076dfb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 09:56:52 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 18 11:08:55 2014 -0500

    bootstrap: Fix syntax for Solaris 10 shell (#15317)
    
    In commit v3.1.0-rc2~7^2 (Workaround for short jump tables on PA-RISC,
    2014-11-04) we added use of shell syntax not supported on the Solaris
    shell.  Avoid using the '!' operator.
    
    Reported-by: Friedrich Haubensak <hsk at imb-jena.de>

diff --git a/bootstrap b/bootstrap
index 94bed0e..fe051e1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -145,7 +145,7 @@ if ${cmake_system_linux}; then
     cmake_machine_parisc=true
   fi
 elif ${cmake_system_hpux}; then
-  if !(uname -m | grep ia64 >/dev/null 2>&1); then
+  if uname -m | grep ia64 >/dev/null 2>&1; then : ; else
     cmake_machine_parisc=true
   fi
 fi

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

Summary of changes:


hooks/post-receive
-- 
CMake