From: Daan De Meyer Date: Thu, 5 Jun 2025 10:14:45 +0000 (+0200) Subject: meson: Don't fail install script if file doesn't exist X-Git-Tag: v256.17~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c46b06335bbec678f286611edc9847ed6ecf827e;p=thirdparty%2Fsystemd.git meson: Don't fail install script if file doesn't exist Depending on which optional features are enabled, the NSS module might not have been built, which means the custom install script will fail to remove the file. Let's pass -f so it succeeds regardless of whether the file exists or not. (cherry picked from commit a292b55980d6ff2afd98deb9bcc3118cfcac4c67) (cherry picked from commit 1a3f658f037e77b38e8645b8fbdadc84c2bb39d8) --- diff --git a/meson.build b/meson.build index 2a888405e34..ea8b4cd9ecf 100644 --- a/meson.build +++ b/meson.build @@ -2616,7 +2616,7 @@ foreach dict : modules if is_nss # We cannot use shared_module because it does not support version suffix. # Unfortunately shared_library insists on creating the symlink… - meson.add_install_script(sh, '-c', 'rm $DESTDIR@0@/lib@1@.so'.format(libdir, name), + meson.add_install_script(sh, '-c', 'rm -f $DESTDIR@0@/lib@1@.so'.format(libdir, name), install_tag : 'nss') nss_targets += lib endif