diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2021-05-26 12:07:27 +0300 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2021-05-26 13:08:05 +0300 |
| commit | 1ec1352c8819b328504b58cd7018428c41804f15 (patch) | |
| tree | fc03c4225a7daca633d2e43ebf183878ae1f1a44 /.gitlab-ci.yml | |
| parent | e9f0a3b8aca3e646715339079739324da4ed5875 (diff) | |
meson: fix csound detection
csound-sys can detect the system lib using either pkg-config or using
the CSOUND_LIB_DIR env variable.
The former case just work but the second is trickier as we need to
ensure that CSOUND_LIB_DIR is defined when building.
So we no longer try to detect the lib using find_library() if user
didn't define the env variable as the build will fail later.
Also explicitly pass the env variable to cargo so user can now call
'CSOUND_LIB_DIR=/usr/lib64 meson build && ninja -C build'
and have it work without repassing the env variable to ninja.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b481397..14577e6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,17 +153,22 @@ test nightly: rules: - if: '$UPDATE_IMG == null || $UPDATE_IMG == "nightly"' -meson shared: +.meson: extends: .img-stable + rules: + - if: '$UPDATE_IMG == null || $UPDATE_IMG == "stable"' + variables: + CSOUND_LIB_DIR: '/usr/lib' + +meson shared: + extends: .meson script: - meson build --default-library=shared --prefix=$(pwd)/install - ninja -C build install - ./ci/check-plugins-installed.py install - rules: - - if: '$UPDATE_IMG == null || $UPDATE_IMG == "stable"' meson static: - extends: .img-stable + extends: .meson script: - meson build --default-library=static --prefix=$(pwd)/install -Dsodium=built-in - ninja -C build install @@ -172,8 +177,6 @@ meson static: - PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(pwd)/../install/lib/x86_64-linux-gnu/pkgconfig meson build - ninja -C build - ./build/test-gst-static - rules: - - if: '$UPDATE_IMG == null || $UPDATE_IMG == "stable"' rustfmt: extends: .img-stable |