mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-04-25 09:40:42 +02:00
ci: build dbus with clang as well
It should make it possible to catch issues like like https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/357 Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
This commit is contained in:
parent
0c3702bfd8
commit
9803fb09fc
3 changed files with 30 additions and 1 deletions
|
|
@ -196,6 +196,15 @@ debian meson:
|
|||
variables:
|
||||
ci_buildsys: "meson-dist"
|
||||
|
||||
debian meson clang debug:
|
||||
extends:
|
||||
- .meson-common
|
||||
- .debian-build
|
||||
variables:
|
||||
ci_buildsys: "meson-dist"
|
||||
ci_compiler: "clang"
|
||||
ci_variant: "debug"
|
||||
|
||||
debian mingw32 autotools debug:
|
||||
extends: .debian-build
|
||||
variables:
|
||||
|
|
|
|||
|
|
@ -77,6 +77,10 @@ init_wine() {
|
|||
# Build system under test: autotools or cmake
|
||||
: "${ci_buildsys:=autotools}"
|
||||
|
||||
# ci_compiler:
|
||||
# Compiler used to build dbus: gcc or clang
|
||||
: "${ci_compiler:=gcc}"
|
||||
|
||||
# ci_distro:
|
||||
# OS distribution in which we are testing
|
||||
# Typical values: auto (detect at runtime), ubuntu, debian; maybe fedora in future
|
||||
|
|
@ -522,6 +526,12 @@ case "$ci_buildsys" in
|
|||
;;
|
||||
(*)
|
||||
set -- -Db_sanitize=address,undefined "$@"
|
||||
|
||||
# https://github.com/mesonbuild/meson/issues/764
|
||||
if [ "$ci_compiler" = "clang" ]; then
|
||||
set -- -Db_lundef=false "$@"
|
||||
fi
|
||||
|
||||
set -- -Db_pie=true "$@"
|
||||
set -- -Duser_session=true "$@"
|
||||
;;
|
||||
|
|
@ -531,6 +541,14 @@ case "$ci_buildsys" in
|
|||
;;
|
||||
esac
|
||||
|
||||
case "$ci_compiler" in
|
||||
(clang)
|
||||
export CC=clang
|
||||
;;
|
||||
(*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# Debian doesn't have similar convenience wrappers, but we can use
|
||||
# a cross-file
|
||||
if [ -z "$meson_setup" ] || ! command -v "$meson_setup" >/dev/null; then
|
||||
|
|
@ -548,7 +566,7 @@ case "$ci_buildsys" in
|
|||
|
||||
$meson_setup "$@" "$srcdir"
|
||||
meson compile -v
|
||||
[ "$ci_test" = no ] || meson test
|
||||
[ "$ci_test" = no ] || meson test --print-errorlogs
|
||||
DESTDIR=DESTDIR meson install
|
||||
( cd DESTDIR && find . -ls)
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -148,6 +148,7 @@ case "$ci_distro" in
|
|||
autotools-dev
|
||||
ca-certificates
|
||||
ccache
|
||||
clang
|
||||
cmake
|
||||
debhelper
|
||||
dh-autoreconf
|
||||
|
|
@ -169,6 +170,7 @@ case "$ci_distro" in
|
|||
libselinux1-dev
|
||||
libsystemd-dev
|
||||
libx11-dev
|
||||
llvm
|
||||
meson
|
||||
ninja-build
|
||||
sudo
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue