diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-09 17:10:15 +0530 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-01-21 09:07:53 +0000 |
| commit | 3563dfe436da023a5151857ba474b5a19faba3e6 (patch) | |
| tree | 118638b8fb1009a7bd0384c1eac151d03f9594d8 | |
| parent | c6e1af995e3b2af2044faf1b815dc5323af7c691 (diff) | |
| download | pixman-3563dfe436da023a5151857ba474b5a19faba3e6.tar.gz | |
meson: Fix warning about extract_all_objects usage
We use this because of a meson bug that was fixed in 0.52:
https://mesonbuild.com/Release-notes-for-0-52-0.html#improved-support-for-static-libraries
Bump the requirement and remove the extract_all_objects workaround.
This gets rid of a meson warning:
WARNING: extract_all_objects called without setting recursive
keyword argument. Meson currently defaults to
non-recursive to maintain backward compatibility but
the default will be changed in the future.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | pixman/meson.build | 9 |
3 files changed, 3 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e850b76..25c73df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,6 @@ meson-build: - dnf -y groupinstall buildsys-build - dnf -y builddep pixman - dnf -y install ninja-build - - python3 -m pip install meson>=0.47.2 + - python3 -m pip install meson>=0.52.1 - meson build - ninja -C build test diff --git a/meson.build b/meson.build index 6ab6a97..bf270ce 100644 --- a/meson.build +++ b/meson.build @@ -23,7 +23,7 @@ project( ['c'], version : '0.40.1', license : 'MIT', - meson_version : '>= 0.50.0', + meson_version : '>= 0.52.0', default_options : ['buildtype=debugoptimized'], ) diff --git a/pixman/meson.build b/pixman/meson.build index 0f1ac6f..1c2e7d3 100644 --- a/pixman/meson.build +++ b/pixman/meson.build @@ -117,17 +117,10 @@ if cpu_features_path != '' cpu_features_inc = include_directories(cpu_features_path) endif -# We cannot use 'link_with' or 'link_whole' because meson wont do the right -# thing for static archives. -_obs = [] -foreach l : pixman_simd_libs - _obs += l.extract_all_objects() -endforeach - libpixman = library( 'pixman-1', [pixman_files, config_h, version_h, cpu_features_sources], - objects : _obs, + link_with: pixman_simd_libs, c_args : libpixman_extra_cargs, dependencies : [dep_m, dep_threads], include_directories : cpu_features_inc, |