richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
Pablo Greco 48fc63
From ce45cf8651fabe48a75d8773dbdbf68f3dc77137 Mon Sep 17 00:00:00 2001
Pablo Greco 48fc63
From: David Tardon <dtardon@redhat.com>
Pablo Greco 48fc63
Date: Tue, 15 Jan 2019 19:05:41 +0100
Pablo Greco 48fc63
Subject: [PATCH] artificially serialize building of .policy files
Pablo Greco 48fc63
Pablo Greco 48fc63
This avoids concurrent write access to translation cache by
Pablo Greco 48fc63
intltool-merge.
Pablo Greco 48fc63
Pablo Greco 48fc63
Resolves: #1272485
Pablo Greco 48fc63
---
Pablo Greco 48fc63
 Makefile.am | 10 ++++++++++
Pablo Greco 48fc63
 1 file changed, 10 insertions(+)
Pablo Greco 48fc63
Pablo Greco 48fc63
diff --git a/Makefile.am b/Makefile.am
Pablo Greco 48fc63
index 40ebbe98ee..995c421b8b 100644
Pablo Greco 48fc63
--- a/Makefile.am
Pablo Greco 48fc63
+++ b/Makefile.am
Pablo Greco 48fc63
@@ -653,6 +653,16 @@ dist_doc_DATA = \
Pablo Greco 48fc63
 
Pablo Greco 48fc63
 @INTLTOOL_POLICY_RULE@
Pablo Greco 48fc63
 
Pablo Greco 48fc63
+# Force serial build of policy files
Pablo Greco 48fc63
+# Note that this ignores the fact that almost all of these files are only built optionally,
Pablo Greco 48fc63
+# but a change in configure options is extremely unlikely at this point.
Pablo Greco 48fc63
+src/core/org.freedesktop.systemd1.policy : src/hostname/org.freedesktop.hostname1.policy
Pablo Greco 48fc63
+src/hostname/org.freedesktop.hostname1.policy : src/import/org.freedesktop.import1.policy
Pablo Greco 48fc63
+src/import/org.freedesktop.import1.policy : src/locale/org.freedesktop.locale1.policy
Pablo Greco 48fc63
+src/locale/org.freedesktop.locale1.policy : src/login/org.freedesktop.login1.policy
Pablo Greco 48fc63
+src/login/org.freedesktop.login1.policy : src/machine/org.freedesktop.machine1.policy
Pablo Greco 48fc63
+src/machine/org.freedesktop.machine1.policy : src/timedate/org.freedesktop.timedate1.policy
Pablo Greco 48fc63
+
Pablo Greco 48fc63
 # ------------------------------------------------------------------------------
Pablo Greco 48fc63
 
Pablo Greco 48fc63
 MANPAGES =