ceph/trunk/fix-python2-paths.patch

   1 --- a/CMakeLists.txt    2018-05-29 14:04:02.000000000 +0200
   2 +++ b/CMakeLists.txt    2018-06-04 13:41:55.684455580 +0200
   3 @@ -49,7 +49,7 @@ endif(WITH_CCACHE)
   4  option(WITH_MANPAGE "Build man pages." ON)
   5  if(WITH_MANPAGE)
   6    find_program(SPHINX_BUILD
   7 -    sphinx-build)
   8 +    sphinx-build2)
   9    if(NOT SPHINX_BUILD)
  10      message(FATAL_ERROR "Can't find sphinx-build.")
  11    endif(NOT SPHINX_BUILD)
  12 --- a/src/tools/setup-virtualenv.sh     2018-05-29 14:04:02.000000000 +0200
  13 +++ b/src/tools/setup-virtualenv.sh     2018-06-04 13:43:24.767175961 +0200
  14 @@ -58,10 +58,10 @@ if [ -z "$DIR" ] ; then
  15  fi
  16  rm -fr $DIR
  17  mkdir -p $DIR
  18 -virtualenv --python $PYTHON_BINARY $DIR
  19 +virtualenv2 --python $PYTHON_BINARY $DIR
  20  . $DIR/bin/activate
  21
  22 -if pip --help | grep -q disable-pip-version-check; then
  23 +if pip2 --help | grep -q disable-pip-version-check; then
  24      DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
  25  else
  26      DISABLE_PIP_VERSION_CHECK=
  27 @@ -69,12 +69,12 @@ fi
  28
  29  # older versions of pip will not install wrap_console scripts
  30  # when using wheel packages
  31 -pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
  32 +pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
  33
  34  # workaround of https://github.com/pypa/setuptools/issues/1042
  35 -pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
  36 +pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
  37
  38 -if pip --help | grep -q disable-pip-version-check; then
  39 +if pip2 --help | grep -q disable-pip-version-check; then
  40      DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
  41  else
  42      DISABLE_PIP_VERSION_CHECK=
  43 @@ -84,7 +84,7 @@ if test -d wheelhouse ; then
  44      export NO_INDEX=--no-index
  45  fi
  46
  47 -pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
  48 +pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
  49  if test -f requirements.txt ; then
  50 -    pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
  51 +    pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
  52  fi