mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
--- a/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
|
|
+++ b/CMakeLists.txt 2018-06-04 13:41:55.684455580 +0200
|
|
@@ -49,7 +49,7 @@ endif(WITH_CCACHE)
|
|
option(WITH_MANPAGE "Build man pages." ON)
|
|
if(WITH_MANPAGE)
|
|
find_program(SPHINX_BUILD
|
|
- sphinx-build)
|
|
+ sphinx-build2)
|
|
if(NOT SPHINX_BUILD)
|
|
message(FATAL_ERROR "Can't find sphinx-build.")
|
|
endif(NOT SPHINX_BUILD)
|
|
--- a/src/tools/setup-virtualenv.sh 2018-05-29 14:04:02.000000000 +0200
|
|
+++ b/src/tools/setup-virtualenv.sh 2018-06-04 13:43:24.767175961 +0200
|
|
@@ -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,12 +69,12 @@ 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'
|
|
|
|
# workaround of https://github.com/pypa/setuptools/issues/1042
|
|
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
|
|
+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade "setuptools < 36"
|
|
|
|
-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=
|
|
@@ -84,7 +84,7 @@ 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
|
|
- 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
|