Commit d1dfad6b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

hwloc: fix race condition in make install 

Fixes:
http://autobuild.buildroot.net/results/983/98364cdbffa06f151ab34b301762321b2a251ec6/
http://autobuild.buildroot.net/results/414/41403f8ce4751a27dd1bb9c43f5a97895dea3980/
http://autobuild.buildroot.net/results/d97/d979624843d2d2020cf43770350a8b9a63dcd04f/

Make install contains a race condition in utils/hwloc, as both
install-exec-hook (through intall-exec) and install-data trigger
install-man.

The install-exec-hook target doesn't do anything with the manual pages, so
fix the race condition by dropping the dependency.

Patch sent upstream:
https://www.open-mpi.org/community/lists/hwloc-devel/2015/05/4442.php



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 0268c3cb

package/hwloc/0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch

0 → 100644
+35 −0
Original line number Diff line number Diff line 
From d5e802c9c2ed8dbe5c937e84bc3ab440218aa8de Mon Sep 17 00:00:00 2001

From: Peter Korsgaard <peter@korsgaard.com>

Date: Tue, 12 May 2015 16:03:14 +0200

Subject: [PATCH] utils/hwloc/Makefile.am: fix install-man race condition



Make install contains a race condition in utils/hwloc, as both

install-exec-hook (through intall-exec) and install-data trigger

install-man:



http://autobuild.buildroot.net/results/414/41403f8ce4751a27dd1bb9c43f5a97895dea3980/build-end.log



The install-exec-hook target doesn't do anything with the manual pages, so

fix the race condition by dropping the dependency.



Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

---

 utils/hwloc/Makefile.am | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/utils/hwloc/Makefile.am b/utils/hwloc/Makefile.am

index 7ca8027..8bbee86 100644

--- a/utils/hwloc/Makefile.am

+++ b/utils/hwloc/Makefile.am

@@ -108,7 +108,7 @@ endif HWLOC_HAVE_LINUX

 	  -e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \

 	  > $@ < $<

 

-install-exec-hook: install-man

+install-exec-hook:

 	$(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

 	$(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

 	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote $(DESTDIR)$(bindir)/hwloc-compress-dir

-- 

2.1.4

package/hwloc/hwloc.mk

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/down 
HWLOC_LICENSE = BSD-3c

HWLOC_LICENSE_FILES = COPYING

HWLOC_DEPENDENCIES = host-pkgconf

# 0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch touches Makefile.am

HWLOC_AUTORECONF = YES



HWLOC_CONF_OPTS = \

	--disable-opencl \