[Cmake-commits] CMake branch, next, updated. v3.1.0-1233-g01eb6be

Brad King brad.king at kitware.com
Thu Dec 18 10:08:48 EST 2014


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  01eb6be389e2e57838150f6b1ba73b3f67bd6fa5 (commit)
       via  eea2973be414d31357a3850b0de6219d652d59b3 (commit)
      from  1090b107730fac0ae870e6da634fdea6aaec50af (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=01eb6be389e2e57838150f6b1ba73b3f67bd6fa5
commit 01eb6be389e2e57838150f6b1ba73b3f67bd6fa5
Merge: 1090b10 eea2973
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 18 10:08:48 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 18 10:08:48 2014 -0500

    Merge topic 'bootstrap-solaris' into next
    
    eea2973b bootstrap: Fix syntax for Solaris 10 shell


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eea2973be414d31357a3850b0de6219d652d59b3
commit eea2973be414d31357a3850b0de6219d652d59b3
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 09:56:52 2014 -0500

    bootstrap: Fix syntax for Solaris 10 shell
    
    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:
 bootstrap |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list