diff options
Diffstat (limited to 'tools/ci-build.sh')
| -rwxr-xr-x | tools/ci-build.sh | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index e8569c3..93acf3b 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -58,17 +58,6 @@ if [ -n "$dbus_ci_system_python" ]; then unset VIRTUAL_ENV export PATH=/usr/bin:/bin export PYTHON="$(command -v "$dbus_ci_system_python")" - - case "$dbus_ci_system_python" in - (python-dbg|python2.7-dbg) - # This is a workaround. Python 2 doesn't have the - # LDVERSION sysconfig variable, which would give - # AX_PYTHON_DEVEL the information it needs to know - # that it should link -lpython2.7_d and not - # -lpython2.7. - export PYTHON_LIBS="-lpython2.7_d" - ;; - esac fi NOCONFIGURE=1 ./autogen.sh @@ -94,7 +83,7 @@ $make -C "$builddir" distcheck $make -C "$builddir" install ( cd "$prefix" && find . -ls ) -dbus_ci_pyversion="$(${PYTHON:-python} -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("VERSION"))')" +dbus_ci_pyversion="$(${PYTHON:-python3} -c 'import sysconfig; print(sysconfig.get_config_var("VERSION"))')" export PYTHONPATH="$prefix/lib/python$dbus_ci_pyversion/site-packages:$PYTHONPATH" export XDG_DATA_DIRS="$prefix/share:/usr/local/share:/usr/share" gnome-desktop-testing-runner dbus-python |