diff options
| author | Sebastian Wick <sebastian.wick@redhat.com> | 2025-10-28 12:11:10 +0100 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2025-11-27 17:39:11 +0200 |
| commit | c8a09967039f14081d1a36c5899cebed95210443 (patch) | |
| tree | 4d7601585dab8b9e97ab1f6007b924b6c483dd1d | |
| parent | protocol: add new formats (diff) | |
| download | wayland-c8a09967039f14081d1a36c5899cebed95210443.tar wayland-c8a09967039f14081d1a36c5899cebed95210443.tar.gz wayland-c8a09967039f14081d1a36c5899cebed95210443.tar.bz2 wayland-c8a09967039f14081d1a36c5899cebed95210443.tar.lz wayland-c8a09967039f14081d1a36c5899cebed95210443.tar.xz wayland-c8a09967039f14081d1a36c5899cebed95210443.tar.zst wayland-c8a09967039f14081d1a36c5899cebed95210443.zip | |
build: Bump to meson version 0.64.0
This version will be required in the next commit.
Bumps the CI image to get the required version from the debian package
instead of from pip.
Removes the bindir builtin directory from pkgconfig.generate() which is
deprecated since 0.62.0. It will be automatically included when
referenced.
Use `meson setup` everywhere instead of relying on deprecated automatic
detection of the setup command.
Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eeed789..bde40e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,11 +78,10 @@ workflow: variables: BUILD_OS: debian FDO_DISTRIBUTION_VERSION: bookworm - FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl python3-pip python3-setuptools ninja-build' - FDO_DISTRIBUTION_EXEC: 'pip3 install --break-system-packages meson~=0.57.2' + FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl meson ninja-build' # bump this tag every time you change something which requires rebuilding the # base image - FDO_DISTRIBUTION_TAG: "2025-01-21.1" + FDO_DISTRIBUTION_TAG: "2025-10-28.1" .debian-x86_64: extends: @@ -223,11 +222,10 @@ armv7-debian-container_prep: - .ci-rules stage: "Build and test" script: - - cd "$BUILDDIR" - - meson --prefix="$PREFIX" -Dicon_directory=/usr/share/X11/icons --fatal-meson-warnings -Dwerror=true ${MESON_BUILD_TYPE} .. - - ninja -k0 -j${FDO_CI_CONCURRENT:-4} - - meson test --num-processes ${FDO_CI_CONCURRENT:-4} - - ninja clean + - meson setup $BUILDDIR --prefix="$PREFIX" -Dicon_directory=/usr/share/X11/icons --fatal-meson-warnings -Dwerror=true ${MESON_BUILD_TYPE} + - ninja -C $BUILDDIR -k0 -j${FDO_CI_CONCURRENT:-4} + - meson test -C $BUILDDIR --num-processes ${FDO_CI_CONCURRENT:-4} + - ninja -C $BUILDDIR clean artifacts: name: wayland-$CI_JOB_NAME when: always @@ -250,7 +248,7 @@ armv7-debian-container_prep: # the workspace to see details about the failed tests. - | set +e - /app/vmctl exec "pkg info; cd $CI_PROJECT_NAME ; meson $BUILDDIR --prefix=$PREFIX $MESON_BUILD_TYPE $MESON_ARGS && ninja -C $BUILDDIR -j${FDO_CI_CONCURRENT:-4}" + /app/vmctl exec "pkg info; cd $CI_PROJECT_NAME ; meson setup $BUILDDIR --prefix=$PREFIX $MESON_BUILD_TYPE $MESON_ARGS && ninja -C $BUILDDIR -j${FDO_CI_CONCURRENT:-4}" /app/vmctl exec "meson test --print-errorlogs -C $BUILDDIR --num-processes ${FDO_CI_CONCURRENT:-4}" && touch .tests-successful set -ex scp -r vm:$BUILDDIR/meson-logs . diff --git a/meson.build b/meson.build index ce386a4..c96ca29 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project( 'wayland', 'c', version: '1.24.90', license: 'MIT', - meson_version: '>= 0.57.0', + meson_version: '>= 0.64.0', default_options: [ 'warning_level=2', 'buildtype=debugoptimized', diff --git a/src/meson.build b/src/meson.build index 984e34a..b3b9ea5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -66,7 +66,6 @@ if get_option('scanner') variables: [ 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), 'wayland_scanner=${bindir}/wayland-scanner' ], filebase: 'wayland-scanner' |