Ticket #7963: use_printf.patch

File use_printf.patch, 3.6 KB (added by anonymous, 10 years ago)
  • bootstrap.sh

    diff --git i/bootstrap.sh w/bootstrap.sh
    index 36e92ff..86d6eff 100755
    i w rm -f config.log  
    213213
    214214# Build bjam
    215215if test "x$BJAM" = x; then
    216   echo -n "Building Boost.Build engine with toolset $TOOLSET... "
     216  printf %s "Building Boost.Build engine with toolset $TOOLSET... "
    217217  pwd=`pwd`
    218218  (cd "$my_dir/tools/build/v2/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
    219219  if [ $? -ne 0 ]; then
    fi  
    270270
    271271if test "x$flag_no_python" = x; then
    272272    if test "x$PYTHON_VERSION" = x; then
    273         echo -n "Detecting Python version... "
     273        printf %s "Detecting Python version... "
    274274        PYTHON_VERSION=`$PYTHON -c "import sys; print (\"%d.%d\" % (sys.version_info[0], sys.version_info[1]))"`
    275275        echo $PYTHON_VERSION
    276276    fi
    277277
    278278    if test "x$PYTHON_ROOT" = x; then
    279         echo -n "Detecting Python root... "
     279        printf %s "Detecting Python root... "
    280280        PYTHON_ROOT=`$PYTHON -c "import sys; print(sys.prefix)"`
    281281        echo $PYTHON_ROOT
    282282    fi   
    283283fi
    284284
    285285# Configure ICU
    286 echo -n "Unicode/ICU support for Boost.Regex?... "
     286printf %s "Unicode/ICU support for Boost.Regex?... "
    287287if test "x$flag_icu" != xno; then
    288288  if test "x$ICU_ROOT" = x; then
    289289    COMMON_ICU_PATHS="/usr /usr/local /sw"
  • tools/boostbook/setup_boostbook.sh

    diff --git i/tools/boostbook/setup_boostbook.sh w/tools/boostbook/setup_boostbook.sh
    index 0e79031..7ddddc9 100644
    i w fi  
    3030
    3131DOCBOOK_XSL_DIR="$PWD/docbook-xsl-$DOCBOOK_XSL_VERSION"
    3232if test ! -d docbook-xsl-$DOCBOOK_XSL_VERSION; then
    33   echo -n "Expanding DocBook XSLT Stylesheets into $DOCBOOK_XSL_DIR..."
     33  printf %s "Expanding DocBook XSLT Stylesheets into $DOCBOOK_XSL_DIR..."
    3434  gunzip -cd $DOCBOOK_XSL_TARBALL | tar xf -
    3535  echo "done."
    3636fi
    fi  
    4747
    4848DOCBOOK_DTD_DIR="$PWD/docbook-dtd-$DOCBOOK_DTD_VERSION"
    4949if test ! -d docbook-dtd-$DOCBOOK_DTD_VERSION; then
    50   echo -n "Expanding DocBook XML DTD into $DOCBOOK_DTD_DIR... "
     50  printf %s "Expanding DocBook XML DTD into $DOCBOOK_DTD_DIR... "
    5151  unzip -q $DOCBOOK_DTD_ZIP -d $DOCBOOK_DTD_DIR
    5252  echo "done."
    5353fi
    else  
    114114  fi
    115115
    116116  if test ! -d $FOP_DIR; then
    117     echo -n "Expanding FOP distribution into $FOP_DIR... ";
     117    printf %s "Expanding FOP distribution into $FOP_DIR... ";
    118118    gunzip -cd $FOP_TARBALL | tar xf -
    119119    echo "done.";
    120120  fi
    if test -r "$HOME/user-config.jam"; then  
    127127  JAM_CONFIG_IN="user-config-backup.jam"
    128128  cp $JAM_CONFIG_OUT user-config-backup.jam
    129129  JAM_CONFIG_IN_TEMP="yes"
    130   echo -n "Updating Boost.Jam configuration in $JAM_CONFIG_OUT... "
     130  printf %s "Updating Boost.Jam configuration in $JAM_CONFIG_OUT... "
    131131
    132132elif test -r "$BOOST_ROOT/tools/build/v2/user-config.jam"; then
    133133  JAM_CONFIG_IN="$BOOST_ROOT/tools/build/v2/user-config.jam";
    134134  JAM_CONFIG_IN_TEMP="no"
    135   echo -n "Writing Boost.Jam configuration to $JAM_CONFIG_OUT... "
     135  printf %s "Writing Boost.Jam configuration to $JAM_CONFIG_OUT... "
    136136else
    137137  echo "ERROR: Please set the BOOST_ROOT environment variable to refer to your"
    138138  echo "Boost installation or copy user-config.jam into your home directory."
  • tools/build/v2/bootstrap.sh

    diff --git i/tools/build/v2/bootstrap.sh w/tools/build/v2/bootstrap.sh
    index 5083551..c3a7eec 100755
    i w rm -f config.log  
    9494
    9595# Build bjam
    9696if test "x$BJAM" = x; then
    97   echo -n "Bootstrapping the build engine with toolset $TOOLSET... "
     97  printf %s "Bootstrapping the build engine with toolset $TOOLSET... "
    9898  pwd=`pwd`
    9999  (cd "$my_dir/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
    100100  if [ $? -ne 0 ]; then