From 5685db73580b49605809c0991125b22907650b1e Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 9 Nov 2023 14:51:50 +0200 Subject: [PATCH] ci: Move the build cflags to a meson native file Similar to what we use for the werror Part-of: --- .gitlab-ci.yml | 7 ------- ci/meson/gst-ci-cflags.ini | 3 +++ ci/scripts/build.sh | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 ci/meson/gst-ci-cflags.ini diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09f7f9292f..0235886b2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,13 +40,6 @@ variables: WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH" WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH" - _CI_CFLAGS: >- - -Wno-error=deprecated-declarations - -ggdb - -fasynchronous-unwind-tables - -fno-omit-frame-pointer - -mno-omit-leaf-frame-pointer - DEFAULT_MESON_ARGS: >- -Dlibnice:tests=disabled -Dlibnice:examples=disabled diff --git a/ci/meson/gst-ci-cflags.ini b/ci/meson/gst-ci-cflags.ini new file mode 100644 index 0000000000..9cf883d908 --- /dev/null +++ b/ci/meson/gst-ci-cflags.ini @@ -0,0 +1,3 @@ +[built-in options] +c_args = [ '-Wno-error=deprecated-declarations', '-ggdb', '-fno-omit-frame-pointer', '-mno-omit-leaf-frame-pointer', '-fasynchronous-unwind-tables'] +cpp_args = c_args diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh index 4e13f45331..c57af28abe 100755 --- a/ci/scripts/build.sh +++ b/ci/scripts/build.sh @@ -28,7 +28,7 @@ if [ "$GST_WERROR" = "true" ]; then fi date -R -meson setup build/ -Dc_args="${_CI_CFLAGS}" -Dcpp_args="${_CI_CFLAGS}" ${ARGS} +meson setup build/ --native-file ./ci/meson/gst-ci-cflags.ini ${ARGS} date -R meson compile -C build/ date -R