c27bdd4dc310d87d7e6254ba62d377fce7991908
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / hwloc / 0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch
1 From d5e802c9c2ed8dbe5c937e84bc3ab440218aa8de Mon Sep 17 00:00:00 2001
2 From: Peter Korsgaard <peter@korsgaard.com>
3 Date: Tue, 12 May 2015 16:03:14 +0200
4 Subject: [PATCH] utils/hwloc/Makefile.am: fix install-man race condition
5
6 Make install contains a race condition in utils/hwloc, as both
7 install-exec-hook (through intall-exec) and install-data trigger
8 install-man:
9
10 http://autobuild.buildroot.net/results/414/41403f8ce4751a27dd1bb9c43f5a97895dea3980/build-end.log
11
12 The install-exec-hook target doesn't do anything with the manual pages, so
13 fix the race condition by dropping the dependency.
14
15 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
16 ---
17  utils/hwloc/Makefile.am | 2 +-
18  1 file changed, 1 insertion(+), 1 deletion(-)
19
20 diff --git a/utils/hwloc/Makefile.am b/utils/hwloc/Makefile.am
21 index 7ca8027..8bbee86 100644
22 --- a/utils/hwloc/Makefile.am
23 +++ b/utils/hwloc/Makefile.am
24 @@ -108,7 +108,7 @@ endif HWLOC_HAVE_LINUX
25           -e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \
26           > $@ < $<
27  
28 -install-exec-hook: install-man
29 +install-exec-hook:
30         $(SED) -e 's/HWLOC_top_builddir\/utils\/hwloc/bindir/' -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote
31         $(SED) -e 's/HWLOC_top_builddir\/utils\/hwloc/bindir/' -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-compress-dir > $(DESTDIR)$(bindir)/hwloc-compress-dir.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-compress-dir.tmp $(DESTDIR)$(bindir)/hwloc-compress-dir
32         chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote $(DESTDIR)$(bindir)/hwloc-compress-dir
33 -- 
34 2.1.4
35