system/hwloc: Fix conflict with mpich.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
B. Watson 2023-08-12 17:59:12 -04:00 committed by Willy Sudiarto Raharjo
parent 71df59683b
commit 1c98526164
No known key found for this signature in database
GPG key ID: 3F617144D7238786
2 changed files with 16 additions and 0 deletions

View file

@ -20,3 +20,7 @@ cudatoolkit:
interfaces. For instance, it may return the list of processors near
NVIDIA GPUs. Note that if I/O device discovery is enabled, GPUs may
also appear as PCI objects in the topology.
openmpi:
If this is installed at build time, the package will include the
netloc_mpi_find_hosts and netloc_rank_order utilities.

View file

@ -4,6 +4,10 @@
# Written by Wainamoinen <wainamoinen@gmail.com>
# 20230812 bkw: Modified by SlackBuilds.org:
# - fix conflict with mpich.
# - mention openmp as optional dep in README.
# 20220211 bkw: Modified by SlackBuilds.org: fix build on 15.0.
cd $(dirname $0) ; CWD=$(pwd)
@ -60,6 +64,14 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
# 20230812 bkw: openmpi is an optional dep. configure checks for mpi.h
# to decide whether it's present... but mpich also installs an mpi.h,
# and hwloc's build will fail if it tries to use mpich. workaround:
# stop configure from finding mpi.h if mpich is installed.
if pkg-config --exists mpich; then
sed -i 's,mpi\.h,MPICH_DISABLED-mpi.h,' configure
fi
SLKCFLAGS+=" -fcommon"
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \