72 lines
2.2 KiB
Diff
72 lines
2.2 KiB
Diff
|
From 713c646ec054b72cfaadd21f3faaa9c5acb96222 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexey Tikhonov <atikhono@redhat.com>
|
||
|
|
Date: Tue, 16 May 2023 15:22:04 +0200
|
||
|
|
Subject: [PATCH] MAN: fix issue with multithread build
|
||
|
|
|
||
|
|
When 'make' runs using multiple threads it can build several man pages
|
||
|
|
in parallel, executing the same '.5.xml.5:' rule. This can result in
|
||
|
|
a race condition where multiple threads access the same 'sssd_user_name.include'
|
||
|
|
file.
|
||
|
|
To avoid this make 'sssd_user_name.include' file a rule dependency.
|
||
|
|
But "Suffix rules cannot have any prerequisites of their own", and suffix
|
||
|
|
rules are obsolete anyway, so change it to pattern rules.
|
||
|
|
---
|
||
|
|
src/man/Makefile.am | 18 ++++++++++--------
|
||
|
|
1 file changed, 10 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/man/Makefile.am b/src/man/Makefile.am
|
||
|
|
index ee44dff97..1e51aebfd 100644
|
||
|
|
--- a/src/man/Makefile.am
|
||
|
|
+++ b/src/man/Makefile.am
|
||
|
|
@@ -117,23 +117,23 @@ man_MANS += sssd-files.5
|
||
|
|
endif # BUILD_FILES_PROVIDER
|
||
|
|
endif
|
||
|
|
|
||
|
|
-SUFFIXES = .1.xml .1 .3.xml .3 .5.xml .5 .8.xml .8
|
||
|
|
-.1.xml.1:
|
||
|
|
+$(builddir)/src/man/sssd_user_name.include:
|
||
|
|
+ @mkdir -p $(builddir)/src/man
|
||
|
|
+ @echo -n $(SSSD_USER) > $(builddir)/src/man/sssd_user_name.include
|
||
|
|
+
|
||
|
|
+%.1: %.1.xml
|
||
|
|
$(XMLLINT) $(XMLLINT_FLAGS) $<
|
||
|
|
$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(DOCBOOK_XSLT) $<
|
||
|
|
|
||
|
|
-.3.xml.3:
|
||
|
|
+%.3: %.3.xml
|
||
|
|
$(XMLLINT) $(XMLLINT_FLAGS) $<
|
||
|
|
$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(DOCBOOK_XSLT) $<
|
||
|
|
|
||
|
|
-.5.xml.5:
|
||
|
|
- @mkdir -p $(builddir)/src/man
|
||
|
|
- @echo -n $(SSSD_USER) > $(builddir)/src/man/sssd_user_name.include
|
||
|
|
+%.5: %.5.xml $(builddir)/src/man/sssd_user_name.include
|
||
|
|
$(XMLLINT) --path "$(srcdir)/src/man:$(builddir)/src/man" $(XMLLINT_FLAGS) $<
|
||
|
|
$(XSLTPROC) --path "$(srcdir)/src/man:$(builddir)/src/man" -o $@ $(XSLTPROC_FLAGS) $(DOCBOOK_XSLT) $<
|
||
|
|
- @rm -f $(builddir)/src/man/sssd_user_name.include
|
||
|
|
|
||
|
|
-.8.xml.8:
|
||
|
|
+%.8: %.8.xml
|
||
|
|
$(XMLLINT) $(XMLLINT_FLAGS) $<
|
||
|
|
$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(DOCBOOK_XSLT) $<
|
||
|
|
|
||
|
|
@@ -215,6 +215,7 @@ clean-local:
|
||
|
|
done
|
||
|
|
rm -f $(man_MANS)
|
||
|
|
rm -f man.stamp
|
||
|
|
+ rm -f $(builddir)/src/man/sssd_user_name.include
|
||
|
|
|
||
|
|
else
|
||
|
|
|
||
|
|
@@ -224,6 +225,7 @@ man.stamp: $(XML_DOC)
|
||
|
|
clean-local:
|
||
|
|
rm -f $(man_MANS)
|
||
|
|
rm -f man.stamp
|
||
|
|
+ rm -f $(builddir)/src/man/sssd_user_name.include
|
||
|
|
|
||
|
|
endif
|
||
|
|
|
||
|
|
--
|
||
|
|
2.38.1
|
||
|
|
|