diff options
Diffstat (limited to 'system/hwloc/hwloc.SlackBuild')
| -rw-r--r-- | system/hwloc/hwloc.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/system/hwloc/hwloc.SlackBuild b/system/hwloc/hwloc.SlackBuild index 86f5bb8df5..679fdf641c 100644 --- a/system/hwloc/hwloc.SlackBuild +++ b/system/hwloc/hwloc.SlackBuild @@ -4,12 +4,16 @@ # 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) PRGNAM=hwloc -VERSION=${VERSION:-2.2.0} +VERSION=${VERSION:-2.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -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" \ |