dcavalca / rpms / systemd

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