update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / tools / build / src / util / indirect.jam

diff --git a/ceph/src/boost/tools/build/src/util/indirect.jam b/ceph/src/boost/tools/build/src/util/indirect.jam
index 40884da96d7994c4371337f1c8d855146abb2a8b..095fea95ff40cb7b2c53bc08c1ab4c03fe0945af 100644 (file)
--- a/ceph/src/boost/tools/build/src/util/indirect.jam
+++ b/ceph/src/boost/tools/build/src/util/indirect.jam
@@ -9,7 +9,7 @@ import numbers ;
 
 
 # The pattern that indirect rules must match: module%rule
-.pattern = ^([^%]*)%([^%]+)$ ;
+.pattern = "^([^%]*)%([^%]+)$" ;
 
 
 #
@@ -31,9 +31,16 @@ local rule indirect-rule ( x )
 #
 rule make ( rulename bound-args * : context ? )
 {
-    context ?= [ CALLER_MODULE ] ;
-    context ?= "" ;
-    return $(context)%$(rulename) $(bound-args) ;
+    if [ MATCH $(.pattern) : $(rulename) ]
+    {
+        return $(rulename) $(bound-args) ;
+    }
+    else
+    {
+        context ?= [ CALLER_MODULE ] ;
+        context ?= "" ;
+        return $(context)%$(rulename) $(bound-args) ;
+    }
 }
 
 
@@ -53,13 +60,13 @@ rule make-qualified ( rulename bound-args * : frames ? )
     {
         frames ?= 1 ;
         # If the rule name includes a Jamfile module, grab it.
-        local module-context = [ MATCH ^(Jamfile<[^>]*>)\\..* : $(rulename) ] ;
+        local module-context = [ MATCH "^(Jamfile<[^>]*>)\\..*" : $(rulename) ] ;
 
         if ! $(module-context)
         {
             # Take the first dot-separated element as module name. This disallows
             # module names with dots, but allows rule names with dots.
-            module-context = [ MATCH ^([^.]*)\\..* : $(rulename) ] ;
+            module-context = [ MATCH "^([^.]*)\\..*" : $(rulename) ] ;
         }
         module-context ?= [ CALLER_MODULE $(frames) ] ;
         return [ make $(rulename) $(bound-args) : $(module-context) ] ;