luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-22 23:29:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump Meson dependency to 0.52.0

Browse Source 
This is what’s available in the new Debian Stable, so we can expect it
to be available pretty much everywhere.

Subsequent commits will clean up old workarounds.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2021-10-07 17:05:12 +01:00
parent a4c9049486
commit 46588698e2
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -441,7 +441,7 @@ macos:
needs: [] needs: []
before_script: before_script:
- bash .gitlab-ci/show-execution-environment.sh - bash .gitlab-ci/show-execution-environment.sh
- pip3 install --user meson==0.49.2 - pip3 install --user meson==0.52.0
- pip3 install --user ninja - pip3 install --user ninja
- export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
script: script:

2
.gitlab-ci/android-ndk.Dockerfile
View File

@ -64,7 +64,7 @@ RUN ./android-setup-env.sh arm64 21
RUN ./android-setup-env.sh arm64 28 RUN ./android-setup-env.sh arm64 28
RUN rm -rf $ANDROID_NDK_PATH RUN rm -rf $ANDROID_NDK_PATH
RUN pip3 install meson==0.49.2 RUN pip3 install meson==0.52.0
ARG HOST_USER_ID=5555 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}

2
.gitlab-ci/debian-stable.Dockerfile
View File

@ -66,7 +66,7 @@ RUN locale-gen de_DE.UTF-8 \
ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
RUN pip3 install meson==0.49.2 RUN pip3 install meson==0.52.0
ARG HOST_USER_ID=5555 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}

2
.gitlab-ci/mingw.Dockerfile
View File

@ -58,7 +58,7 @@ RUN dnf -y install \
WORKDIR /opt WORKDIR /opt
COPY cross_file_mingw64.txt /opt COPY cross_file_mingw64.txt /opt
RUN pip3 install meson==0.49.2 RUN pip3 install meson==0.52.0
ARG HOST_USER_ID=5555 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}

2
.gitlab-ci/test-msvc.bat
View File

@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
@echo on @echo on
:: FIXME: make warnings fatal :: FIXME: make warnings fatal
pip3 install --upgrade --user meson==0.49.2 || goto :error pip3 install --upgrade --user meson==0.52.0 || goto :error
meson _build || goto :error meson _build || goto :error
ninja -C _build || goto :error ninja -C _build || goto :error

2
.gitlab-ci/test-msys2.sh
View File

@ -31,7 +31,7 @@ CCACHE_BASEDIR="$(pwd)"
CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
export CCACHE_BASEDIR CCACHE_DIR export CCACHE_BASEDIR CCACHE_DIR
pip3 install --upgrade --user meson==0.49.2 pip3 install --upgrade --user meson==0.52.0
PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
CFLAGS="-coverage -ftest-coverage -fprofile-arcs" CFLAGS="-coverage -ftest-coverage -fprofile-arcs"

4
meson.build
View File

@ -1,7 +1,7 @@
project('glib', 'c', 'cpp', project('glib', 'c', 'cpp',
version : '2.71.0', version : '2.71.0',
# NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships
meson_version : '>= 0.49.2', meson_version : '>= 0.52.0',
default_options : [ default_options : [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
'warning_level=1', 'warning_level=1',