[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2431-gad123ef

[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  ad123efe8561b544de2974805bae228f89a961b3 (commit)
       via  bce7a2a3a5dedcdbc04732a3a3be74c383f2a04a (commit)
      from  a1f098ab47755fc94f90f1abceef7f4ffb2ffd87 (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=ad123efe8561b544de2974805bae228f89a961b3
commit ad123efe8561b544de2974805bae228f89a961b3
Merge: a1f098a bce7a2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 11 09:38:23 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 11 09:38:23 2013 -0400

    Merge topic 'aix-shared-flags' into next
    
    bce7a2a AIX: Do not use -brtl to create shared libraries (#13997)

diff --cc Modules/Platform/AIX-GNU.cmake
index a73a7a2,7e86b14..e5d9434
--- a/Modules/Platform/AIX-GNU.cmake
+++ b/Modules/Platform/AIX-GNU.cmake
@@@ -21,7 -21,6 +21,7 @@@ set(__AIX_COMPILER_GNU 1
  macro(__aix_compiler_gnu lang)
    set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:")
    set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
-   set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G,-brtl,-bnoipath")
+   set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G,-bnoipath")
    set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-brtl,-bnoipath,-bexpall")  # +s, flag for exe link to use shared lib
 +  set(CMAKE_${lang}_USE_IMPLICIT_LINK_DIRECTORIES_IN_RUNTIME_PATH 1)
  endmacro()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bce7a2a3a5dedcdbc04732a3a3be74c383f2a04a
commit bce7a2a3a5dedcdbc04732a3a3be74c383f2a04a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 11 08:51:01 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 11 09:01:27 2013 -0400

    AIX: Do not use -brtl to create shared libraries (#13997)
    
    The flag was added incorrectly by commit 9c3a6eb4 (Need -brtl when creating
    shared libraries, 2003-05-16).  According to "man ld" the -G option implies
    "-brtl -bnortllib ...", -brtl implies "-brtllib", and -brtllib should only be
    used for executables, not shared libraries.  Therefore it is incorrect and
    unnecessary to specify -brtl explicitly after -G.
    
    Reported-by: Kevin Burge <kcburge at gmail.com>

diff --git a/Modules/Platform/AIX-GNU.cmake b/Modules/Platform/AIX-GNU.cmake
index 81ba365..7e86b14 100644
--- a/Modules/Platform/AIX-GNU.cmake
+++ b/Modules/Platform/AIX-GNU.cmake
@@ -21,6 +21,6 @@ set(__AIX_COMPILER_GNU 1)
 macro(__aix_compiler_gnu lang)
   set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:")
   set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
-  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G,-brtl,-bnoipath")
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G,-bnoipath")
   set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-brtl,-bnoipath,-bexpall")  # +s, flag for exe link to use shared lib
 endmacro()
diff --git a/Modules/Platform/AIX-XL.cmake b/Modules/Platform/AIX-XL.cmake
index 1f94152..abf3855 100644
--- a/Modules/Platform/AIX-XL.cmake
+++ b/Modules/Platform/AIX-XL.cmake
@@ -21,7 +21,7 @@ set(__AIX_COMPILER_XL 1)
 macro(__aix_compiler_xl lang)
   set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:")
   set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
-  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-G -Wl,-brtl,-bnoipath")  # -shared
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-G -Wl,-bnoipath")  # -shared
   set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-brtl,-bnoipath,-bexpall")  # +s, flag for exe link to use shared lib
   set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS " ")
   set(CMAKE_SHARED_MODULE_${lang}_FLAGS  " ")

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

Summary of changes:
 Modules/Platform/AIX-GNU.cmake |    2 +-
 Modules/Platform/AIX-XL.cmake  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake