From 36bbdde2feede712a39c3220600acd3a671f0d63 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <vladimir.prus@gmail.com>
Date: Fri, 28 Oct 2016 11:56:15 +0300
Subject: [PATCH] Use Boost-global python tagging.

---
 build/Jamfile | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/build/Jamfile b/build/Jamfile
index 0753ff4a..313fdab3 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -48,27 +48,8 @@ py3-version = [ find-py3-version ] ;
 
 project boost/python
   : source-location ../src
-  : requirements
-    -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-    <tag>@$(__name__).tag
   ;
 
-rule tag ( name : type ? : property-set )
-{
-    local result = $(name) ;
-    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
-    {
-        if $(name) = boost_python && $(PYTHON_ID)
-        {
-            result = $(result)-$(PYTHON_ID) ;
-        }
-    }
-    
-    # forward to the boost tagging rule
-    return  [ indirect.call $(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag 
-                $(result) : $(type) : $(property-set) ] ;
-}
-
 rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
 rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
 
@@ -132,6 +113,10 @@ rule lib_boost_python ( is-py3 ? )
 
             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
             [ cond $(is-py3) : <python>$(py3-version) ]
+
+            -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
+            <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
+
         :   # default build
             <link>shared
         :   # usage requirements
@@ -158,6 +143,10 @@ rule lib_boost_numpy ( is-py3 ? )
 	    <library>boost_python
             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
             [ cond $(is-py3) : <python>$(py3-version) ]
+
+            -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
+            <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
+
         :   # default build
             <link>shared
         :   # usage requirements