import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / bootstrap.sh

diff --git a/ceph/src/boost/bootstrap.sh b/ceph/src/boost/bootstrap.sh
index c6f3423d3d9773c8958a1e1358b71d095cf3f575..ca0b08d580831f11a5168f36addc6dc863f7c5af 100755 (executable)
--- a/ceph/src/boost/bootstrap.sh
+++ b/ceph/src/boost/bootstrap.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# Copyright 2019 Rene Rivera
 # Copyright (C) 2005, 2006 Douglas Gregor.
 # Copyright (C) 2006 The Trustees of Indiana University
 #
@@ -194,7 +195,7 @@ my_dir=$(dirname "$0")
 if test "x$TOOLSET" = x; then
   guessed_toolset=`$my_dir/tools/build/src/engine/build.sh --guess-toolset`
   case $guessed_toolset in
-    acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
+    acc | clang | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
     TOOLSET=$guessed_toolset
     ;;
     
@@ -230,11 +231,9 @@ if test "x$BJAM" = x; then
       exit 1
   fi
   cd "$pwd"
-  arch=`cd $my_dir/tools/build/src/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
-  BJAM="$my_dir/tools/build/src/engine/$arch/b2"
-  echo "tools/build/src/engine/$arch/b2"
+  BJAM="$my_dir/tools/build/src/engine/b2"
+  echo "tools/build/src/engine/b2"
   cp "$BJAM" .
-  cp "$my_dir/tools/build/src/engine/$arch/bjam" .
 
 fi
 
@@ -292,6 +291,11 @@ fi
 # Configure ICU
 $ECHO -n "Unicode/ICU support for Boost.Regex?... "
 if test "x$flag_icu" != xno; then
+  if test "x$ICU_ROOT" = x; then
+    if command -v pkg-config > /dev/null && pkg-config icu-uc ; then
+      ICU_ROOT=`pkg-config --variable=prefix icu-uc`
+    fi
+  fi
   if test "x$ICU_ROOT" = x; then
     COMMON_ICU_PATHS="/usr /usr/local /sw"
     for p in $COMMON_ICU_PATHS; do
@@ -328,7 +332,7 @@ if test -r "project-config.jam"; then
 fi
 
 # Generate user-config.jam
-echo "Generating Boost.Build configuration in project-config.jam..."
+echo "Generating Boost.Build configuration in project-config.jam for $TOOLSET..."
 cat > project-config.jam <<EOF
 # Boost.Build Configuration
 # Automatically generated by bootstrap.sh
@@ -355,7 +359,7 @@ if test "x$flag_no_python" = x; then
 import python ;
 if ! [ python.configured ]
 {
-    using python : $PYTHON_VERSION : $PYTHON_ROOT ;
+    using python : $PYTHON_VERSION : "$PYTHON_ROOT" ;
 }
 EOF
 fi
@@ -376,7 +380,7 @@ cat >> project-config.jam << EOF
 # override this variable.
 libraries = $LIBS ;
 
-# These settings are equivivalent to corresponding command-line
+# These settings are equivalent to corresponding command-line
 # options.
 option.set prefix : $PREFIX ;
 option.set exec-prefix : $EPREFIX ;
@@ -393,6 +397,10 @@ Bootstrapping is done. To build, run:
 
     ./b2
     
+To generate header files, run:
+
+    ./b2 headers
+
 To adjust configuration, edit 'project-config.jam'.
 Further information:
 
@@ -403,6 +411,6 @@ Further information:
      http://www.boost.org/more/getting_started/unix-variants.html
      
    - Boost.Build documentation:
-     http://www.boost.org/build/doc/html/index.html
+     http://www.boost.org/build/
 
 EOF