| William A. Kennington III | b95905d | 2021-06-02 12:40:56 -0700 | [diff] [blame] | 1 | From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> |
| 3 | Date: Mon, 12 Apr 2021 14:03:32 +0200 |
| 4 | Subject: [PATCH] meson: do not fail if rsync is not installed with meson |
| 5 | 0.57.2 |
| 6 | |
| 7 | https://github.com/mesonbuild/meson/issues/8641 |
| 8 | |
| 9 | Our CI started to fail. Even if the change is reverted in meson, |
| 10 | we need a quick workaround here. |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | man/meson.build | 25 ++++++++++++++----------- |
| 16 | 1 file changed, 14 insertions(+), 11 deletions(-) |
| 17 | |
| 18 | diff --git a/man/meson.build b/man/meson.build |
| 19 | index 3cae8446cda..f9c4b83dc81 100644 |
| 20 | --- a/man/meson.build |
| 21 | +++ b/man/meson.build |
| 22 | @@ -184,17 +184,20 @@ html = custom_target( |
| 23 | depends : html_pages, |
| 24 | command : ['echo']) |
| 25 | |
| 26 | -run_target( |
| 27 | - 'doc-sync', |
| 28 | - depends : man_pages + html_pages, |
| 29 | - command : ['rsync', '-rlv', |
| 30 | - '--delete-excluded', |
| 31 | - '--include=man', |
| 32 | - '--include=*.html', |
| 33 | - '--exclude=*', |
| 34 | - '--omit-dir-times', |
| 35 | - meson.current_build_dir(), |
| 36 | - get_option('www-target')]) |
| 37 | +rsync = find_program('rsync', required : false) |
| 38 | +if rsync.found() |
| 39 | + run_target( |
| 40 | + 'doc-sync', |
| 41 | + depends : man_pages + html_pages, |
| 42 | + command : [rsync, '-rlv', |
| 43 | + '--delete-excluded', |
| 44 | + '--include=man', |
| 45 | + '--include=*.html', |
| 46 | + '--exclude=*', |
| 47 | + '--omit-dir-times', |
| 48 | + meson.current_build_dir(), |
| 49 | + get_option('www-target')]) |
| 50 | +endif |
| 51 | |
| 52 | ############################################################ |
| 53 | |