[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-399-g84af91f

[Chuck Atkins]

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  84af91f9e53e6f0f5a091e357542b5a255650183 (commit)
       via  74dcab9da0ed21e68082b0aef8b48fe37c6b62ec (commit)
      from  7cda68d1f7df6b144ade0b7b3011c1e6609b462f (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=84af91f9e53e6f0f5a091e357542b5a255650183
commit 84af91f9e53e6f0f5a091e357542b5a255650183
Merge: 7cda68d 74dcab9
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Nov 6 19:33:24 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 6 19:33:24 2014 -0500

    Merge topic 'fix-gcc-hppa' into next
    
    74dcab9d Fix bootstrap for parisc "else" case


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74dcab9da0ed21e68082b0aef8b48fe37c6b62ec
commit 74dcab9da0ed21e68082b0aef8b48fe37c6b62ec
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Nov 6 19:31:42 2014 -0500
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Nov 6 19:31:42 2014 -0500

    Fix bootstrap for parisc "else" case

diff --git a/bootstrap b/bootstrap
index 00af2a1..94bed0e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -134,19 +134,18 @@ if echo "${cmake_system}" | grep Linux >/dev/null 2>&1; then
   cmake_system_linux=true
 else
   cmake_system_linux=false
-fi
+ fi
 
 # Determine whether this is a PA-RISC machine
+# This only works for Linux or HP-UX, not other PA-RISC OSs (BSD maybe?). Also
+# may falsely detect parisc on HP-UX m68k
+cmake_machine_parisc=false
 if ${cmake_system_linux}; then
   if uname -m | grep parisc >/dev/null 2>&1; then
     cmake_machine_parisc=true
-  else
-    cmake_machine_parisc=false
   fi
 elif ${cmake_system_hpux}; then
-  if uname -m | grep ia64 >/dev/null 2>&1; then
-    cmake_machine_parisc=false
-  else
+  if !(uname -m | grep ia64 >/dev/null 2>&1); then
     cmake_machine_parisc=true
   fi
 fi

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

Summary of changes:
 bootstrap |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake