diff options
| author | B. Watson <urchlay@slackware.uk> | 2023-08-12 17:59:12 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-08-19 09:15:30 +0700 |
| commit | 1c9852616451985a9f1f680b4201aa685f931c5a (patch) | |
| tree | 46999c1b83b2be1086938ac1d84ee27e4e155f81 /system/hwloc | |
| parent | 71df59683bc906a5d797df86ee5e723c91288344 (diff) | |
system/hwloc: Fix conflict with mpich.
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/hwloc')
| -rw-r--r-- | system/hwloc/README | 4 | ||||
| -rw-r--r-- | system/hwloc/hwloc.SlackBuild | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/system/hwloc/README b/system/hwloc/README index c70e4d8a9ee2c..7e3226d2f1af9 100644 --- a/system/hwloc/README +++ b/system/hwloc/README @@ -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. diff --git a/system/hwloc/hwloc.SlackBuild b/system/hwloc/hwloc.SlackBuild index 86f5bb8df52dd..af67a17a635f2 100644 --- a/system/hwloc/hwloc.SlackBuild +++ b/system/hwloc/hwloc.SlackBuild @@ -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" \ |