|
@@ -0,0 +1,35 @@
|
|
|
+From 18fe7d300f133c2b9eb93bb4bd81e4644979a74b Mon Sep 17 00:00:00 2001
|
|
|
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
|
|
|
+Date: Tue, 1 Jul 2014 13:13:43 -0600
|
|
|
+Subject: [PATCH] kadm5: fix race in Makefile with kadm5_err.h
|
|
|
+
|
|
|
+When running make with -j4, occasionally kadm5 fails due to a missing
|
|
|
+header file kadm5_err.h. Fix the race condition.
|
|
|
+
|
|
|
+Reported at https://bugzilla.redhat.com/1115164
|
|
|
+
|
|
|
+Reviewed-by: Ken Dreyer <ktdreyer@ktdreyer.com>
|
|
|
+
|
|
|
+Backported from upstream commit
|
|
|
+6affa4cceceaa1369dd895f8acdd7a883ee65674.
|
|
|
+
|
|
|
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
+---
|
|
|
+ lib/kadm5/Makefile.am | 1 +
|
|
|
+ 1 file changed, 1 insertion(+)
|
|
|
+
|
|
|
+diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
|
|
|
+index f8be3b1..1b399b1 100644
|
|
|
+--- a/lib/kadm5/Makefile.am
|
|
|
++++ b/lib/kadm5/Makefile.am
|
|
|
+@@ -155,6 +155,7 @@ iprop-commands.c iprop-commands.h: iprop-commands.in
|
|
|
+ $(SLC) $(srcdir)/iprop-commands.in
|
|
|
+
|
|
|
+ $(libkadm5srv_la_OBJECTS): kadm5_err.h
|
|
|
++$(libkadm5clnt_la_OBJECTS): kadm5_err.h
|
|
|
+ $(iprop_log_OBJECTS): iprop-commands.h
|
|
|
+
|
|
|
+ client_glue.lo server_glue.lo: $(srcdir)/common_glue.c
|
|
|
+--
|
|
|
+2.4.5
|
|
|
+
|