import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / predef / test / build.jam

diff --git a/ceph/src/boost/libs/predef/test/build.jam b/ceph/src/boost/libs/predef/test/build.jam
index 223950e1065b08ecd8c27b2cb79126e8399a843c..e894a31e9623eae992d33492a7030205ae423f25 100644 (file)
--- a/ceph/src/boost/libs/predef/test/build.jam
+++ b/ceph/src/boost/libs/predef/test/build.jam
@@ -1,49 +1,26 @@
-#!/usr/bin/env b2 -a --verbose-test
-# Copyright Rene Rivera 2011-2016
+# Copyright Rene Rivera 2011-2019
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-import ../check/predef : require check : predef-require predef-check ;
+import ../tools/check/predef : require check : predef-require predef-check ;
+import path ;
 
-local predef-include-root ;
-local predef-dependency ;
-
-local modular-predef-h = [ glob $(BOOST_PREDEF_ROOT)/include/boost/predef.h ] ;
-local BOOST_RELEASE_LAYOUT ;
-if ! $(modular-predef-h)
-{
-    BOOST_RELEASE_LAYOUT = yes ;
-}
-
-# When using modular layout, header files are not present in $root/boost
-# unlink links are created, therefore instead of direct dependency on
-# a header, we need to use dependency on metatarget.
-if $(BOOST_RELEASE_LAYOUT)
-{
-   predef-dependency = $(predef-include-root)/boost/predef.h ;
-}
-else if $(BOOST_PREDEF_ROOT)
-{
-    predef-include-root = $(BOOST_PREDEF_ROOT)/include ;
-    predef-dependency = $(predef-include-root)/boost/predef.h ;
-}
-else if $(BOOST_MODULARLAYOUT)
-{
-    predef-include-root = $(BOOST_ROOT) ;
-    predef-dependency = /boost//predef-headers ;
-}
-else
+# This deals with the unfortunate aspect of a Boost monolithic release
+# not having the modular include dirs. This is a kludge that just removes
+# the direct depdndency to the header if it can't find it.
+local PREDEF_H = $(BOOST_PREDEF_INCLUDE)/boost/predef.h ;
+if ! [ path.exists $(PREDEF_H) ]
 {
-   predef-dependency = $(predef-include-root)/boost/predef.h ;
+    PREDEF_H = ;
 }
 
-project predef-test
+project
     :   requirements
-        <include>$(predef-include-root)
+        <include>$(BOOST_PREDEF_INCLUDE)
         # Add explicit dependency since we don't have header scanner for
         # .m and .mm files.
-        <dependency>$(predef-dependency)
+        <dependency>$(PREDEF_H)
     ;
 
 using testing ;