You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.8 KiB
55 lines
1.8 KiB
2 years ago
|
From d5cefb7293d2999dcad81bd71933b319ca6c3590 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Mon, 12 Apr 2021 14:03:32 +0200
|
||
|
|
Subject: [PATCH] meson: do not fail if rsync is not installed with meson
|
||
|
|
0.57.2
|
||
|
|
|
||
|
|
https://github.com/mesonbuild/meson/issues/8641
|
||
|
|
|
||
|
|
Our CI started to fail. Even if the change is reverted in meson,
|
||
|
|
we need a quick workaround here.
|
||
|
|
|
||
|
|
(cherry picked from commit 7c5fd25119a495009ea62f79e5daec34cc464628)
|
||
|
|
|
||
|
|
Related: #2017033
|
||
|
|
---
|
||
|
|
man/meson.build | 25 ++++++++++++++-----------
|
||
|
|
1 file changed, 14 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/man/meson.build b/man/meson.build
|
||
|
|
index a953d34098..efc8836d0c 100644
|
||
|
|
--- a/man/meson.build
|
||
|
|
+++ b/man/meson.build
|
||
|
|
@@ -178,17 +178,20 @@ html = custom_target(
|
||
|
|
depends : html_pages,
|
||
|
|
command : ['echo'])
|
||
|
|
|
||
|
|
-run_target(
|
||
|
|
- 'doc-sync',
|
||
|
|
- depends : man_pages + html_pages,
|
||
|
|
- command : ['rsync', '-rlv',
|
||
|
|
- '--delete-excluded',
|
||
|
|
- '--include=man',
|
||
|
|
- '--include=*.html',
|
||
|
|
- '--exclude=*',
|
||
|
|
- '--omit-dir-times',
|
||
|
|
- meson.current_build_dir(),
|
||
|
|
- get_option('www-target')])
|
||
|
|
+rsync = find_program('rsync', required : false)
|
||
|
|
+if rsync.found()
|
||
|
|
+ run_target(
|
||
|
|
+ 'doc-sync',
|
||
|
|
+ depends : man_pages + html_pages,
|
||
|
|
+ command : [rsync, '-rlv',
|
||
|
|
+ '--delete-excluded',
|
||
|
|
+ '--include=man',
|
||
|
|
+ '--include=*.html',
|
||
|
|
+ '--exclude=*',
|
||
|
|
+ '--omit-dir-times',
|
||
|
|
+ meson.current_build_dir(),
|
||
|
|
+ get_option('www-target')])
|
||
|
|
+endif
|
||
|
|
|
||
|
|
############################################################
|
||
|
|
|