aboutsummaryrefslogtreecommitdiff
path: root/meta/recipes-support/icu/icu/fix-install-manx.patch
blob: 8186fb412274c2cdd54164228b0590dbc8a09c30 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
From 3063a9211669bee673840ee81f81d30699b9b702 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 9 Oct 2015 17:50:41 +0100
Subject: [PATCH 2/4] icu: fix install race

The generic recursive target calls target-local so also adding it to the
dependency list results in races due to install-local being executed twice in
parallel.  For example, install-manx can fail if the two install processes race
and one process tries to chown a file that the other process has just deleted.

Also install-manx should be a phony target, and for clarity use $^ instead of $?
in the install command.

Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 source/Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/Makefile.in b/source/Makefile.in
index c1db15b..4948deb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,7 +73,7 @@ EXTRA_DATA =
 
 ## List of phony targets
 .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls		\
-install-recursive clean clean-local clean-recursive distclean		\
+install-recursive install-manx clean clean-local clean-recursive distclean		\
 distclean-local distclean-recursive doc dist dist-local dist-recursive	\
 check check-local check-recursive clean-recursive-with-twist install-icu \
 doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \
@@ -84,9 +84,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist
 
 ## List of standard targets
 all: all-local all-recursive
-install: install-recursive install-local
+install: install-recursive
 clean: clean-recursive-with-twist clean-local
-distclean : distclean-recursive distclean-local
+distclean : distclean-recursive
 dist: dist-recursive
 check: all check-recursive
 check-recursive: all
@@ -350,7 +350,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h
 
 install-manx: $(MANX_FILES)
 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION)
-	$(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION)
+	$(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION)
 
 config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in
 	cd $(top_builddir) \
-- 
2.14.2