| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame^] | 1 | From 2d544cac238eccbfc32cafc9502ddf6e00994211 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 4 | Subject: [PATCH] icu: fix install race |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 6 | The generic recursive target calls target-local so also adding it to the |
| 7 | dependency list results in races due to install-local being executed twice in |
| 8 | parallel. For example, install-manx can fail if the two install processes race |
| 9 | and one process tries to chown a file that the other process has just deleted. |
| 10 | |
| 11 | Also install-manx should be a phony target, and for clarity use $^ instead of $? |
| 12 | in the install command. |
| 13 | |
| 14 | Upstream-Status: Pending |
| 15 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | --- |
| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame^] | 17 | Makefile.in | 8 ++++---- |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 19 | |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 20 | diff --git a/Makefile.in b/Makefile.in |
| Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame^] | 21 | index 8366f01..79b91c9 100644 |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 22 | --- a/Makefile.in |
| 23 | +++ b/Makefile.in |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 24 | @@ -77,7 +77,7 @@ EXTRA_DATA = |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 25 | |
| 26 | ## List of phony targets |
| 27 | .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ |
| 28 | -install-recursive clean clean-local clean-recursive distclean \ |
| 29 | +install-recursive install-manx clean clean-local clean-recursive distclean \ |
| 30 | distclean-local distclean-recursive doc dist dist-local dist-recursive \ |
| 31 | check check-local check-recursive clean-recursive-with-twist install-icu \ |
| 32 | doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 33 | @@ -88,9 +88,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 34 | |
| 35 | ## List of standard targets |
| 36 | all: all-local all-recursive |
| 37 | -install: install-recursive install-local |
| 38 | +install: install-recursive |
| 39 | clean: clean-recursive-with-twist clean-local |
| 40 | -distclean : distclean-recursive distclean-local |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 41 | +distclean : distclean-recursive |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 42 | dist: dist-recursive |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 43 | check: all check-recursive |
| 44 | check-recursive: all |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 45 | @@ -357,7 +357,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 46 | install-manx: $(MANX_FILES) |
| 47 | $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 48 | ifneq ($(MANX_FILES),) |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 49 | - $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) |
| 50 | + $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION) |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 51 | endif |
| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 52 | |
| 53 | config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in |