diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-09-07 09:32:31 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2022-09-13 08:57:42 -0400 |
| commit | 952a04a9f26706c13af569419b7966f36899ee0c (patch) | |
| tree | 631ff5f79302d5cc87dd5853d444bca8d3006bca | |
| parent | 0c7bb301f44cd26d36edda38d5cd8e7bf99a44a9 (diff) | |
| download | fontconfig-952a04a9f26706c13af569419b7966f36899ee0c.tar.gz | |
meson: Do not run fc-cache when installing into a DESTDIR
It cause permission denied errors because it is often not run as root.
This requires Meson >=0.57.0.
| -rw-r--r-- | fc-cache/meson.build | 3 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fc-cache/meson.build b/fc-cache/meson.build index 5e40fac..313cfef 100644 --- a/fc-cache/meson.build +++ b/fc-cache/meson.build @@ -9,5 +9,6 @@ tools_man_pages += ['fc-cache'] # Do not try to execute target's fc-cache on host when cross compiling if get_option('cache-build').enabled() and not meson.is_cross_build() - meson.add_install_script(fccache, '-s', '-f', '-v') + meson.add_install_script(fccache, '-s', '-f', '-v', + skip_if_destdir: true) endif diff --git a/meson.build b/meson.build index aca67ad..88b553b 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('fontconfig', 'c', version: '2.14.0', - meson_version : '>= 0.56.0', + meson_version : '>= 0.57.0', default_options: [ 'buildtype=debugoptimized'], ) |