From 20385dd7b917272d552fe004e58a03e77114cd80 Mon Sep 17 00:00:00 2001 From: Martin Abente Lahaye Date: Thu, 11 Jul 2024 11:44:43 -0400 Subject: [PATCH] ci: Support setting libdir in install-meson-project.sh Besides building custom fedora images, we will build system extensions for GNOME OS. Since GNOME OS uses a a different libdir compared to what meson defaults to, we must allow setting libdir in this script. See https://discourse.gnome.org/t/towards-a-better-way-to-hack-and-test-your-system-components/21075 See https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/837 Part-of: --- .gitlab-ci/install-meson-project.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci/install-meson-project.sh b/.gitlab-ci/install-meson-project.sh index 8ecf8a300..e1b46163b 100755 --- a/.gitlab-ci/install-meson-project.sh +++ b/.gitlab-ci/install-meson-project.sh @@ -12,6 +12,7 @@ usage() { -Dkey=val Option to pass on to meson --subdir Build subdirectory instead of whole project --prepare Script to run before build + --libdir Setup the project with a different libdir -h, --help Display this help @@ -23,6 +24,7 @@ TEMP=$(getopt \ --options='D:h' \ --longoptions='subdir:' \ --longoptions='prepare:' \ + --longoptions='libdir:' \ --longoptions='help' \ -- "$@") @@ -50,6 +52,11 @@ while true; do shift 2 ;; + --libdir) + MESON_OPTIONS+=( --libdir=$2 ) + shift 2 + ;; + -h|--help) usage exit 0