Add fix for parallel builds in po-docs
related: RHEL-33851
This commit is contained in:
parent
1574b7d34d
commit
9edacc7cb2
@ -0,0 +1,38 @@
|
|||||||
|
From 5efc6ee4723c828655c4ea2b56f40c0156536762 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||||
|
Date: Wed, 24 Apr 2024 22:15:16 +0100
|
||||||
|
Subject: [PATCH] po-docs: Make sure guestmount.1 depends on includes
|
||||||
|
|
||||||
|
guestmount.1 depends on translated files blocksize-option.pod,
|
||||||
|
key-option.pod & keys-from-stdin-option.pod (via __INCLUDE__
|
||||||
|
directives). If these are not yet translated by the time we try to
|
||||||
|
generate guestmount.1 then it will fail with:
|
||||||
|
|
||||||
|
podwrapper.pl: key-option.pod: cannot find input file on path at /builddir/build/BUILD/libguestfs-1.50.1/podwrapper.pl line 672.
|
||||||
|
|
||||||
|
This happens especially in parallel builds. Fix this by writing the
|
||||||
|
guestmount.1 rule explicitly, with the correct dependencies.
|
||||||
|
|
||||||
|
(cherry picked from commit 87b4d19f851feee2ea5776421e216a8c541b4355)
|
||||||
|
---
|
||||||
|
po-docs/language.mk | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/po-docs/language.mk b/po-docs/language.mk
|
||||||
|
index 9fdb4c2f..62a148e0 100644
|
||||||
|
--- a/po-docs/language.mk
|
||||||
|
+++ b/po-docs/language.mk
|
||||||
|
@@ -110,6 +110,13 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfis
|
||||||
|
--license GPLv2+ \
|
||||||
|
$<
|
||||||
|
|
||||||
|
+guestmount.1: guestmount.pod blocksize-option.pod key-option.pod keys-from-stdin-option.pod
|
||||||
|
+ $(PODWRAPPER) \
|
||||||
|
+ --no-strict-checks \
|
||||||
|
+ --man $@ \
|
||||||
|
+ --license GPLv2+ \
|
||||||
|
+ $<
|
||||||
|
+
|
||||||
|
virt-builder.1: virt-builder.pod customize-synopsis.pod customize-options.pod
|
||||||
|
$(PODWRAPPER) \
|
||||||
|
--no-strict-checks \
|
@ -136,6 +136,7 @@ Patch0042: 0042-python-Fix-exception-name-in-example.patch
|
|||||||
Patch0043: 0043-po-docs-Rename-guestfs-release-notes-historical-to-g.patch
|
Patch0043: 0043-po-docs-Rename-guestfs-release-notes-historical-to-g.patch
|
||||||
Patch0044: 0044-po-docs-Run-po4a-translate-and-sed-commands-separate.patch
|
Patch0044: 0044-po-docs-Run-po4a-translate-and-sed-commands-separate.patch
|
||||||
Patch0045: 0045-Update-common-submodule.patch
|
Patch0045: 0045-Update-common-submodule.patch
|
||||||
|
Patch0046: 0046-po-docs-Make-sure-guestmount.1-depends-on-includes.patch
|
||||||
|
|
||||||
%if 0%{patches_touch_autotools}
|
%if 0%{patches_touch_autotools}
|
||||||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user