--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ endif(WITH_CCACHE) option(WITH_MANPAGE "Build man pages." ON) if(WITH_MANPAGE) find_program(SPHINX_BUILD - NAMES sphinx-build sphinx-build-3) + NAMES sphinx-build2 sphinx-build-3) if(NOT SPHINX_BUILD) message(FATAL_ERROR "Can't find sphinx-build.") endif(NOT SPHINX_BUILD) @@ -272,7 +272,7 @@ if(WITH_BLUESTORE) endif() endif() -if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64|aarch64") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64|aarch64|x86_64-native-linuxapp-gcc") option(WITH_SPDK "Enable SPDK" ON) else() option(WITH_SPDK "Enable SPDK" OFF) --- a/src/tools/setup-virtualenv.sh +++ b/src/tools/setup-virtualenv.sh @@ -58,10 +58,10 @@ if [ -z "$DIR" ] ; then fi rm -fr $DIR mkdir -p $DIR -virtualenv --python $PYTHON_BINARY $DIR +virtualenv2 --python $PYTHON_BINARY $DIR . $DIR/bin/activate -if pip --help | grep -q disable-pip-version-check; then +if pip2 --help | grep -q disable-pip-version-check; then DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check else DISABLE_PIP_VERSION_CHECK= @@ -69,9 +69,9 @@ fi # older versions of pip will not install wrap_console scripts # when using wheel packages -pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1' +pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1' -if pip --help | grep -q disable-pip-version-check; then +if pip2 --help | grep -q disable-pip-version-check; then DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check else DISABLE_PIP_VERSION_CHECK= @@ -81,10 +81,10 @@ if test -d wheelhouse ; then export NO_INDEX=--no-index fi -pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1' +pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1' if test -f requirements.txt ; then if ! test -f wheelhouse/md5 || ! md5sum -c wheelhouse/md5 > /dev/null; then NO_INDEX='' fi - pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt + pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt fi