From 45f7fe44c80894408d172f0e29e682a3b5aaa6d3 Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
Date: Thu, 23 Apr 2015 13:07:58 +0200
Subject: [PATCH] set sharedlib version on aix when aix-soname=svr4

---
 boostcpp.jam | 3 ++-
 tools/build  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/boostcpp.jam b/boostcpp.jam
index a964caf4177..a7a9606b743 100644
--- a/boostcpp.jam
+++ b/boostcpp.jam
@@ -153,7 +153,8 @@ rule tag ( name : type ? : property-set )
         # libFoo.1.2.3.dylib format. AIX linkers do not accept version suffixes
         # either. Pgi compilers can not accept a library with version suffix.
         if $(type) = SHARED_LIB &&
-          ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix &&
+          ( ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix ||
+            ( [ $(property-set).get <target-os> ] in aix && [ $(property-set).get <aix-soname> ] = svr4 ) ) &&
           ! [ $(property-set).get <toolset> ] in pgi
         {
             result = $(result).$(BOOST_VERSION)  ;
diff --git a/tools/build b/tools/build
index 2e764707e03..c55f0753b2f 160000
--- a/tools/build
+++ b/tools/build
@@ -1 +1 @@
-Subproject commit 2e764707e03d25b6928501c25a717e195c0a8851
+Subproject commit c55f0753b2f683e56c1ff4d84ba6d517e2bf5a76