Skip to content

Commit 67b2c03

Browse files
committed
dist: fix embedders autogen by adding standalone-directories to embedded tarball
Embedders don't get utils,tests,contrib/*,doc,... directories in their tarball because they build hwloc in embedded mode. However it means their tarballs cannot be re-autogen'ed because automake fails when those directories are missing (automake doesn't know if we're in embedded or standalone mode). OMPI didn't have any issue in the past because they manually copied hwloc embedded directories AND created standalone subdirectories that their automake would dist. Now that they use hwloc as git submodule, bring the proper fix inside hwloc so that OMPI doesn't have to hardwire that list of subdirectories anymore. Refs open-mpi/ompi#7363 Note that pure-hwloc embedded tarballs still cannot be re-autogen'ed because they needs many more standalone files (e.g. all .in files used by configure) but we do not care. Signed-off-by: Brice Goglin <[email protected]> (cherry picked from commit b332c93)
1 parent ecea0a6 commit 67b2c03

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

Makefile.am

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,19 @@ endif
7171
if HWLOC_BUILD_STANDALONE
7272
dist-hook:
7373
sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)"
74-
endif HWLOC_BUILD_STANDALONE
74+
else !HWLOC_BUILD_STANDALONE
75+
# Create directories needed by embedders' autogen (directories ignored by embedded dist)
76+
dist-hook:
77+
@MKDIR_P@ \
78+
$(distdir)/doc \
79+
$(distdir)/netloc \
80+
$(distdir)/utils \
81+
$(distdir)/tests \
82+
$(distdir)/contrib/hwloc-ps.www \
83+
$(distdir)/contrib/misc \
84+
$(distdir)/contrib/systemd \
85+
$(distdir)/contrib/windows
86+
endif !HWLOC_BUILD_STANDALONE
7587

7688
if HWLOC_BUILD_STANDALONE
7789
if HWLOC_HAVE_WINDOWS

0 commit comments

Comments
 (0)