richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
b677e7
From 7fb2d86b58201341a582b739a5445821bec66eea Mon Sep 17 00:00:00 2001
b677e7
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
b677e7
Date: Wed, 6 Nov 2019 12:44:39 +0100
b677e7
Subject: [PATCH] meson: remove strange dep that causes meson to enter infinite
b677e7
 loop
b677e7
b677e7
The value is obviously bogus, but didn't seem to cause problems so far.
b677e7
With meson-0.52.0, it causes a hang. The number of aliases is always rather
b677e7
small (usually just one or two, possibly up to a dozen in a few cases), so
b677e7
even if this causes some looping, it is strange that it has such a huge impact.
b677e7
But let's just remove it.
b677e7
b677e7
Fixes #13742.
b677e7
b677e7
Tested with meson-0.52.0-1.module_f31+6771+f5d842eb.noarch,
b677e7
meson-0.51.1-1.fc29.noarch.
b677e7
b677e7
(cherry picked from commit af336643a01d0b210b18312c253a50594ba54b0a)
b677e7
b677e7
Resolves: #1970860
b677e7
---
b677e7
 man/meson.build | 1 -
b677e7
 1 file changed, 1 deletion(-)
b677e7
b677e7
diff --git a/man/meson.build b/man/meson.build
b677e7
index ec05d73bc6..a953d34098 100644
b677e7
--- a/man/meson.build
b677e7
+++ b/man/meson.build
b677e7
@@ -68,7 +68,6 @@ foreach tuple : xsltproc.found() ? manpages : []
b677e7
                 foreach htmlalias : htmlaliases
b677e7
                         link = custom_target(
b677e7
                                 htmlalias,
b677e7
-                                input : p2,
b677e7
                                 output : htmlalias,
b677e7
                                 command : ['ln', '-fs', html, '@OUTPUT@'])
b677e7
                         if want_html