mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-19 05:34:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'c23-c11' into 'main'

Browse source 
meson, ci: Raise the minimum to C11 and use C17 or C23 if available

See merge request wayland/wayland!507
This commit is contained in:
Neal Gompa (ニール・ゴンパ) 2026-02-04 02:50:57 +00:00
commit da9f1837fd
2 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
.gitlab-ci.yml
View file

@ -175,6 +175,11 @@ armv7-debian-container_prep:
variables: variables:
MESON_BUILD_TYPE: "-Dbuildtype=release" MESON_BUILD_TYPE: "-Dbuildtype=release"
.build-oldstd:
stage: "Other build configurations"
variables:
MESON_ARGS: "-Dc_std=c11"
# OS/architecture-specific variants # OS/architecture-specific variants
.build-env-debian-x86_64: .build-env-debian-x86_64:
@ -222,7 +227,7 @@ armv7-debian-container_prep:
- .ci-rules - .ci-rules
stage: "Build and test" stage: "Build and test"
script: script:
- meson setup $BUILDDIR --prefix="$PREFIX" -Dicon_directory=/usr/share/X11/icons --fatal-meson-warnings -Dwerror=true ${MESON_BUILD_TYPE} - meson setup $BUILDDIR --prefix="$PREFIX" -Dicon_directory=/usr/share/X11/icons --fatal-meson-warnings -Dwerror=true ${MESON_BUILD_TYPE} ${MESON_ARGS}
- ninja -C $BUILDDIR -k0 -j${FDO_CI_CONCURRENT:-4} - ninja -C $BUILDDIR -k0 -j${FDO_CI_CONCURRENT:-4}
- meson test -C $BUILDDIR --num-processes ${FDO_CI_CONCURRENT:-4} - meson test -C $BUILDDIR --num-processes ${FDO_CI_CONCURRENT:-4}
- ninja -C $BUILDDIR install - ninja -C $BUILDDIR install
@ -279,6 +284,12 @@ x86_64-release-debian-build:
- .do-build - .do-build
- .build-release - .build-release
x86_64-oldstd-debian-build:
extends:
- .build-env-debian-x86_64
- .do-build
- .build-oldstd
aarch64-debian-build: aarch64-debian-build:
extends: extends:
- .build-env-debian-aarch64 - .build-env-debian-aarch64
@ -290,6 +301,12 @@ aarch64-release-debian-build:
- .do-build - .do-build
- .build-release - .build-release
aarch64-oldstd-debian-build:
extends:
- .build-env-debian-aarch64
- .do-build
- .build-oldstd
armv7-debian-build: armv7-debian-build:
extends: extends:
- .build-env-debian-armv7 - .build-env-debian-armv7
@ -301,6 +318,12 @@ armv7-release-debian-build:
- .do-build - .do-build
- .build-release - .build-release
armv7-oldstd-debian-build:
extends:
- .build-env-debian-armv7
- .do-build
- .build-oldstd
# Base variables used for anything using a FreeBSD environment # Base variables used for anything using a FreeBSD environment
.os-freebsd: .os-freebsd:
variables: variables:

2
meson.build
View file

@ -6,7 +6,7 @@ project(
default_options: [ default_options: [
'warning_level=2', 'warning_level=2',
'buildtype=debugoptimized', 'buildtype=debugoptimized',
'c_std=c99', 'c_std=' + (meson.version().version_compare('>=1.3.0') ? 'c23,c17,c11' : 'c11'),
] ]
) )