Skip to content

Commit

Permalink
meson: 0.55.1 is needed for Python 3.12+
Browse files Browse the repository at this point in the history
Sample error with 0.55.0

```
  File "[…]/python3.12/site-packages/mesonbuild/dependencies/base.py", line 32, in <module>
    import pkg_resources
ModuleNotFoundError: No module named 'pkg_resources'
```
  • Loading branch information
mr-c committed Jul 14, 2024
1 parent 8f727c0 commit 030c07c
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
displayName: System Information
- script: sudo add-apt-repository 'ppa:ubuntu-toolchain-r/test' && sudo apt-get update && sudo apt-get install -y ninja-build ninja-build python3-pip python3-setuptools python3-wheel clang-14 clang-tools-14
displayName: Install APT Dependencies
- script: pip3 install -v meson==0.55.0
- script: pip3 install -v meson==0.55.1
displayName: Install pip Dependencies
- script: scan-build-14 /home/vsts/.local/bin/meson setup build -Db_sanitize=address,undefined
displayName: Configure
Expand All @@ -47,7 +47,7 @@ jobs:
displayName: System Information
- script: sudo add-apt-repository 'ppa:ubuntu-toolchain-r/test' && sudo apt-get update && sudo apt-get install -y ninja-build ninja-build python3-pip python3-setuptools python3-wheel gcc-10 g++-10
displayName: Install APT Dependencies
- script: pip3 install meson==0.55.0
- script: pip3 install meson==0.55.1
displayName: Install pip Dependencies
- script: /home/vsts/.local/bin/meson setup build -Db_sanitize=address,undefined
displayName: Configure
Expand All @@ -72,7 +72,7 @@ jobs:
# displayName: System Information
# - script: sudo dpkg --add-architecture mips64el && sudo apt-get update && sudo apt-get install -y ninja-build ninja-build python3-pip python3-setuptools python3-wheel libc6:mips64el gcc-10-mips64el-linux-gnuabi64 g++-10-mips64el-linux-gnuabi64 qemu-user-static
# displayName: Install APT Dependencies
# - script: pip3 install meson=0.55.0
# - script: pip3 install meson==0.55.1
# displayName: Install pip Dependencies
# - script: /home/vsts/.local/bin/meson setup build --cross-file=docker/cross-files/loongson-gcc-10.cross
# displayName: Configure
Expand Down
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- run: apt-get update && apt-get install -y git ssh ninja-build pipx python3-setuptools python3-wheel gcovr gcc g++
- checkout
- run: cat /proc/cpuinfo /proc/meminfo
- run: pipx install meson==0.55.0
- run: pipx install meson==0.55.1
- run: /root/.local/bin/meson setup build -Db_coverage=true
- run: ninja -C build -v -j 5
- run: ninja -C build -v test
Expand All @@ -35,7 +35,7 @@ jobs:
- run: apt-get update && apt-get install -y git ssh ninja-build pipx python3-setuptools python3-wheel gcovr clang
- checkout
- run: cat /proc/cpuinfo /proc/meminfo
- run: pipx install meson==0.55.0
- run: pipx install meson==0.55.1
- run: CFLAGS="-Wno-unsafe-buffer-usage" CXXFLAGS="-Wno-unsafe-buffer-usage" CC=clang CXX=clang++ /root/.local/bin/meson setup build -Db_coverage=true
- run: ninja -C build -v -j 5
- run: ninja -C build -v test
Expand All @@ -60,7 +60,7 @@ jobs:
ccache --set-config=compression=true
ccache -p
ccache -z
- run: pipx install meson==0.55.0
- run: pipx install meson==0.55.1
- run: /root/.local/bin/meson setup build -Db_coverage=true --cross-file=docker/cross-files/loongson-gcc-ccache.cross
- restore_cache:
keys:
Expand All @@ -87,7 +87,7 @@ jobs:
name: System Information
command: cat /proc/cpuinfo /proc/meminfo
- run: dpkg --add-architecture i386
- run: pipx install meson==0.55.0
- run: pipx install meson==0.55.1
- run: /root/.local/bin/meson setup build -Db_coverage=true --cross-file docker/cross-files/i686-gcc-qemu.cross
- restore_cache:
keys:
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
name: System Information
command: cat /proc/cpuinfo /proc/meminfo
- run: dpkg --add-architecture i386
- run: pipx install meson==0.55.0
- run: pipx install meson==0.55.1
- run: /root/.local/bin/meson setup build -Db_coverage=true --cross-file docker/cross-files/i686-gcc-11-qemu.cross
- restore_cache:
keys:
Expand Down
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ task:
install_dependencies_script:
- apt-get update
- apt-get install -y ninja-build ninja-build pipx python3-setuptools python3-wheel gcovr clang-17
- pipx install meson==0.55.0
- pipx install meson==0.55.1
configure_script:
- /root/.local/bin/meson setup build -Db_coverage=true -Db_sanitize=address,undefined -Db_lundef=false
build_script:
Expand Down
4 changes: 2 additions & 2 deletions .drone.star.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def main(ctx):
"echo 'APT::Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries",
"apt-get update -y",
"apt-get install -y " + " ".join(packages),
"pip3 install meson==0.55.0",
"pip3 install meson==0.55.1",
"meson build -Db_coverage=true || (cat build/meson-logs/meson-log.txt; false)",
"ninja -C build -v test || (cat build/meson-logs/testlog.txt; false)",
],
Expand Down Expand Up @@ -102,7 +102,7 @@ def main(ctx):
# "cat /proc/cpuinfo",
# "apt-get update -y",
# "apt-get install -y " + " ".join(['ninja-build', 'git-core', 'python3-pip', 'gcovr', 'clang', 'curl']),
# "pip3 install meson==0.55.0",
# "pip3 install meson==0.55.1",
# "(cd test && sh -x ./native-aliases.sh)",
# "meson build -Db_coverage=true",
# "ninja -C build -v test",
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install APT Dependencies
run: |
sudo apt-get install -y ninja-build ninja-build pipx
pipx install meson==0.55.0
pipx install meson==0.55.1
- run: |
meson setup build --prefix $PWD/install -Dtests=false
meson install -C build --quiet
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
sudo apt-get purge -y gcc g++
sudo ln -s /usr/bin/gcc-12 /usr/bin/gcc
sudo ln -s /usr/bin/g++-12 /usr/bin/g++
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: add ccache to the build path
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
sudo apt-get purge -y gcc g++
sudo ln -s /usr/bin/gcc-12 /usr/bin/gcc
sudo ln -s /usr/bin/g++-12 /usr/bin/g++
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: add ccache to the build path
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
run: |
sudo apt-get update && \
sudo apt-get install -y ninja-build ninja-build python3-pip parallel gcovr &&\
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: Install emscripten
run: |
git clone https://github.com/emscripten-core/emsdk.git /opt/emsdk
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
run: |
sudo apt-get update && \
sudo apt-get -yq install libxml2-utils ninja-build parallel gcovr && \
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: Convert
run: ./test/native-aliases.sh
- name: Configure
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
- name: Install APT Dependencies
run: |
sudo apt-get install -y ninja-build ninja-build parallel gcovr libsleef-dev
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: Configure
run: meson setup build -Dsleef=enabled -Db_coverage=true
- name: Build
Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
sudo apt-get update
sudo apt-get -yq install gcovr python3-pip ninja-build parallel gcc-${{ matrix.version }} g++-${{ matrix.version }}
sudo apt-get -y purge g++ gcc
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: ccache
uses: hendrikmuhs/[email protected]
if: ${{ matrix.ccache == 'true' }}
Expand Down Expand Up @@ -440,7 +440,7 @@ jobs:
gcc-${{ matrix.version }}-${{ matrix.arch_gnu }}-linux-gnu${{ matrix.arch_gnu_abi }} \
g++-${{ matrix.version }}-${{ matrix.arch_gnu }}-linux-gnu${{ matrix.arch_gnu_abi }} binfmt-support \
qemu-user-static python3-pip libc6-${{ matrix.arch_deb }}-cross libstdc++-${{ matrix.version }}-dev-${{ matrix.arch_deb }}-cross
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: ccache
uses: hendrikmuhs/[email protected]
with:
Expand Down Expand Up @@ -592,7 +592,7 @@ jobs:
binfmt-support clang-${{ matrix.version }} clang++-${{ matrix.version }} \
qemu-user-static python3-pip libc6-${{ matrix.arch_deb }}-cross libstdc++-12-dev-${{ matrix.arch_deb }}-cross \
binutils-${{ matrix.arch_gnu }}-linux-gnu${{ matrix.arch_gnu_abi }}
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
- name: ccache
uses: hendrikmuhs/[email protected]
with:
Expand Down Expand Up @@ -688,7 +688,7 @@ jobs:
sudo add-apt-repository ppa:savoury1/llvm-defaults-16
sudo apt-get update
sudo apt-get -yq install gcovr ninja-build python3-pip clang-${{ matrix.version }}
sudo python3 -m pip install meson==0.55.0
sudo python3 -m pip install meson==0.55.1
sudo rm /usr/bin/gcc /usr/bin/g++ /usr/bin/cc /usr/bin/c++
sudo ln -s $(command -v clang-${{ matrix.version }}) /usr/bin/cc
sudo ln -s $(command -v clang-${{ matrix.version }}) /usr/bin/c++
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- run: |
sudo add-apt-repository 'ppa:ubuntu-toolchain-r/test' && sudo apt-get update && sudo apt-get install -y ninja-build ninja-build python3-pip python3-setuptools python3-wheel gcc-10 g++-10
pip3 install meson==0.55.0
pip3 install meson==0.55.1
"$HOME/.local/bin/meson" setup build
ninja -C build -v
ninja -C build -v test
Expand Down
2 changes: 1 addition & 1 deletion .packit/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ cat /proc/meminfo
PATH="${PATH}:${HOME}/.local/bin"

# Install additional packages.
pip3 install meson==0.55.0
pip3 install meson==0.55.1

# Run test.

Expand Down
4 changes: 2 additions & 2 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ blocks:
- git submodule update --init
- sudo apt-get update
- sudo apt-get install -y ninja-build python3-pip python3-setuptools gcovr gcc-${GCC_VERSION} g++-${GCC_VERSION}
- pip3 install meson==0.55.0
- pip3 install meson==0.55.1
- mkdir build
- CC="gcc-${GCC_VERSION}" CXX="g++-${GCC_VERSION}" ~/.local/bin/meson setup build -Db_coverage=true --optimization $(expr $RANDOM % 3)
- ~/.local/bin/meson compile -C build --ninja-args=-v
Expand All @@ -42,7 +42,7 @@ blocks:
- git submodule update --init
- sudo apt-get update
- sudo apt-get install -y ninja-build python3-pip python3-setuptools gcovr clang-${CLANG_VERSION}
- pip3 install meson==0.55.0
- pip3 install meson==0.55.1
- mkdir build
- CC="clang-${CLANG_VERSION}" CXX="clang++-${CLANG_VERSION}" ~/.local/bin/meson setup build -Db_coverage=true
- ~/.local/bin/meson compile -C build --ninja-args=-v
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ before_install:
- cat /proc/meminfo

install:
- pip3 install meson==0.55.0
- pip3 install meson==0.55.1

script:
- meson setup build -Db_coverage=true
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN \

# Meson on stable is too old, and we want to make sure we keep 0.55
# working for a while.
RUN pipx install meson==0.55.0
RUN pipx install meson==0.55.1

# GCC cross-compilers
RUN \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN \

# Meson on stable is too old, and we want to make sure we keep 0.55
# working for a while.
RUN pipx install meson==0.55.0
RUN pipx install meson==0.55.1

# GCC cross-compilers
RUN \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubuntu_bionic
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN \

# Meson on stable is too old, and we want to make sure we keep 0.55
# working for a while.
RUN pip3 install meson==0.55.0
RUN pip3 install meson==0.55.1

# GCC cross-compilers
RUN \
Expand Down

0 comments on commit 030c07c

Please sign in to comment.