]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: Don't fail install script if file doesn't exist
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 5 Jun 2025 10:14:45 +0000 (12:14 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 25 Jun 2025 17:17:42 +0000 (18:17 +0100)
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)

meson.build

index 2a888405e34a954a2b0dc25e887c4d37952d9fbe..ea8b4cd9ecf4cf7f865e7c840a2cf4a5f94362d2 100644 (file)
@@ -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