aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-12-03 12:49:46 -0500
committerEli Schwartz <eschwartz@archlinux.org>2022-01-10 18:36:56 -0500
commit0c30db20b1769f8cc9082bb9f043882e86ad738e (patch)
tree221e69f380756f8f8cbd0dde7f1e031e99b7bdd1
parent6f8008cd7df4e3fa662cb7f63323f18d100ed88f (diff)
downloadmeson-0c30db20b1769f8cc9082bb9f043882e86ad738e.zip
meson-0c30db20b1769f8cc9082bb9f043882e86ad738e.tar.gz
meson-0c30db20b1769f8cc9082bb9f043882e86ad738e.tar.bz2
update ubuntu bionic to use python 3.7
The pip package is for python 3.6, but installs pip for all versions of python. Apparently. Including python 3.7. So do all other packages, especially the ones where it doesn't work but pip thinks it is installed anyway. Force a reinstall.
-rwxr-xr-xci/ciimage/bionic/install.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/ci/ciimage/bionic/install.sh b/ci/ciimage/bionic/install.sh
index 4dea73b..370088b 100755
--- a/ci/ciimage/bionic/install.sh
+++ b/ci/ciimage/bionic/install.sh
@@ -10,6 +10,7 @@ export DC=gdc
pkgs=(
python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev
+ python3.7 python3.7-dev
wget unzip cmake doxygen
clang
pkg-config-arm-linux-gnueabihf
@@ -47,7 +48,13 @@ done
# packages
eatmydata apt-get -y install "${pkgs[@]}"
-install_python_packages
+# Actually select the right python version
+update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.6 1 \
+ --slave /usr/lib/x86_64-linux-gnu/pkgconfig/python3.pc python3.pc /usr/lib/x86_64-linux-gnu/pkgconfig/python-3.6.pc
+update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 2 \
+ --slave /usr/lib/x86_64-linux-gnu/pkgconfig/python3.pc python3.pc /usr/lib/x86_64-linux-gnu/pkgconfig/python-3.7.pc
+
+python3 -m pip install -U "${base_python_pkgs[@]}" "${python_pkgs[@]}"
# Install the ninja 0.10
wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip