hwloc: bump (#5578)

* hwloc: bump

* Conflicts

* HWLOC: bump to stable, conflicts
This commit is contained in:
extrowerk
2021-01-13 07:21:18 +01:00
committed by GitHub
parent 3d9d02b191
commit 139b28bef6
2 changed files with 206 additions and 27 deletions

View File

@@ -27,7 +27,7 @@ Stuttgart
(RIST)
2015-2016 Intel, Inc."
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
SOURCE_URI="https://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-$portVersion.tar.bz2"
CHECKSUM_SHA256="16a061cabd9319eb8cf9c6705c79142520b5b38d28a3f2a1d832bcb2fb7ea5fd"
PATCHES="hwloc-$portVersion.patchset"
@@ -35,11 +35,37 @@ PATCHES="hwloc-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandBinDir=$prefix/bin
fi
libVersion="5.7.8"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
hwloc$secondaryArchSuffix = $portVersion
lib:libhwloc$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libltdl$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
"
PROVIDES_devel="
hwloc${secondaryArchSuffix}_devel = $portVersion
devel:libhwloc$secondaryArchSuffix = $libVersion
"
REQUIRES_devel="
hwloc$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
hwloc2${secondaryArchSuffix}_devel
"
PROVIDES_tools="
hwloc${secondaryArchSuffix}_tools = $portVersion
cmd:hwloc_annotate$secondaryArchSuffix = $portVersion
cmd:hwloc_assembler$secondaryArchSuffix = $portVersion
cmd:hwloc_assembler_remote$secondaryArchSuffix = $portVersion
@@ -57,20 +83,13 @@ PROVIDES="
cmd:hwloc_ps$secondaryArchSuffix = $portVersion
cmd:lstopo$secondaryArchSuffix = $portVersion
cmd:lstopo_no_graphics$secondaryArchSuffix = $portVersion
lib:libhwloc$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libltdl$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
"
PROVIDES_devel="
hwloc${secondaryArchSuffix}_devel = $portVersion
devel:libhwloc$secondaryArchSuffix = $libVersion
"
REQUIRES_devel="
REQUIRES_tools="
hwloc$secondaryArchSuffix == $portVersion base
$REQUIRES
"
CONFLICTS_tools="
hwloc2${secondaryArchSuffix}_tools
"
BUILD_REQUIRES="
@@ -94,23 +113,25 @@ BUILD_PREREQUIRES="
defineDebugInfoPackage hwloc$secondaryArchSuffix \
$libDir/hwloc/hwloc_xml_libxml.so \
$libDir/libhwloc.so.$libVersion \
$binDir/lstopo-no-graphics \
$binDir/hwloc-annotate \
$binDir/hwloc-assembler \
$binDir/hwloc-bind \
$binDir/hwloc-calc \
$binDir/hwloc-diff \
$binDir/hwloc-distances \
$binDir/hwloc-distrib \
$binDir/hwloc-info \
$binDir/hwloc-patch \
$binDir/hwloc-ps
"$(getPackagePrefix tools)"/bin/hwloc-annotate \
"$(getPackagePrefix tools)"/bin/hwloc-assembler \
"$(getPackagePrefix tools)"/bin/hwloc-bind \
"$(getPackagePrefix tools)"/bin/hwloc-calc \
"$(getPackagePrefix tools)"/bin/hwloc-diff \
"$(getPackagePrefix tools)"/bin/hwloc-distances \
"$(getPackagePrefix tools)"/bin/hwloc-distrib \
"$(getPackagePrefix tools)"/bin/hwloc-info \
"$(getPackagePrefix tools)"/bin/hwloc-patch \
"$(getPackagePrefix tools)"/bin/hwloc-ps \
"$(getPackagePrefix tools)"/bin/lstopo-no-graphics
BUILD()
{
autoreconf -fi
runConfigure ./configure --enable-plugins
make
LDFLAGS="-lnetwork" \
runConfigure --omit-dirs "binDir sbinDir" ./configure \
--sbindir=$commandBinDir \
--enable-plugins
make $jobArgs
}
INSTALL()
@@ -129,10 +150,14 @@ INSTALL()
$docDir/hwloc-*.pdf \
$manDir/man3
packageEntries tools \
$commandBinDir
install -t $docDir AUTHORS COPYING README
}
TEST()
{
export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/hwloc/.libs
make check
}

View File

@@ -0,0 +1,154 @@
SUMMARY="The Hardware Locality library"
DESCRIPTION="The Hardware Locality (hwloc) software project aims at easing the \
process of discovering hardware resources in parallel architectures. It offers \
command-line tools and a C API for consulting these resources, their locality, \
attributes, and interconnection. hwloc primarily aims at helping \
high-performance computing (HPC) applications, but is also applicable to any \
project seeking to exploit code and/or data locality on modern computing \
platforms."
HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
COPYRIGHT="2004-2006 The Trustees of Indiana University and Indiana \
University Research and Technology Corporation
2004-2005 The University of Tennessee and The University of Tennessee \
Research Foundation
2004-2005 High Performance Computing Center Stuttgart, University of \
Stuttgart
2004-2005 The Regents of the University of California
2009 CNRS
2009-2016 Inria
2009-2015 Université Bordeaux
2009-2015 Cisco Systems, Inc.
2009-2012 Oracle and/or its affiliates
2010 IBM
2010 Jirka Hladky
2012 Aleksej Saushev, The NetBSD Foundation
2012 Blue Brain Project, EPFL
2013-2014 University of Wisconsin-La Crosse
2015 Research Organization for Information Science and Technology \
(RIST)
2015-2016 Intel, Inc."
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="
https://download.open-mpi.org/release/hwloc/v${portVersion%.*}/hwloc-$portVersion.tar.bz2"
CHECKSUM_SHA256="b607f6097873f69ef6b4b01e66e0dcb45f9939e8979827284664bbf0d4018a64"
SOURCE_DIR="hwloc-$portVersion"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandBinDir=$prefix/bin
fi
libVersion="15.3.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
hwloc2$secondaryArchSuffix = $portVersion
lib:libhwloc$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libltdl$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
"
PROVIDES_devel="
hwloc2${secondaryArchSuffix}_devel = $portVersion
devel:libhwloc$secondaryArchSuffix = $libVersion
"
REQUIRES_devel="
hwloc2$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
hwloc${secondaryArchSuffix}_devel
"
PROVIDES_tools="
hwloc2${secondaryArchSuffix}_tools = $portVersion
cmd:hwloc_annotate$secondaryArchSuffix = $portVersion
cmd:hwloc_bind$secondaryArchSuffix = $portVersion
cmd:hwloc_calc$secondaryArchSuffix = $portVersion
cmd:hwloc_compress_dir$secondaryArchSuffix = $portVersion
cmd:hwloc_diff$secondaryArchSuffix = $portVersion
cmd:hwloc_distrib$secondaryArchSuffix = $portVersion
cmd:hwloc_gather_cpuid$secondaryArchSuffix = $portVersion
cmd:hwloc_info$secondaryArchSuffix = $portVersion
cmd:hwloc_ls$secondaryArchSuffix = $portVersion
cmd:hwloc_patch$secondaryArchSuffix = $portVersion
cmd:hwloc_ps$secondaryArchSuffix = $portVersion
cmd:lstopo$secondaryArchSuffix = $portVersion
cmd:lstopo_no_graphics$secondaryArchSuffix = $portVersion
"
REQUIRES_tools="
hwloc2$secondaryArchSuffix == $portVersion base
$REQUIRES
"
CONFLICTS_tools="
hwloc${secondaryArchSuffix}_tools
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libxml2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage hwloc2$secondaryArchSuffix \
$libDir/hwloc/hwloc_xml_libxml.so \
$libDir/libhwloc.so.$libVersion \
"$(getPackagePrefix tools)"/bin/hwloc-annotate \
"$(getPackagePrefix tools)"/bin/hwloc-bind \
"$(getPackagePrefix tools)"/bin/hwloc-calc \
"$(getPackagePrefix tools)"/bin/hwloc-diff \
"$(getPackagePrefix tools)"/bin/hwloc-distrib \
"$(getPackagePrefix tools)"/bin/hwloc-gather-cpuid \
"$(getPackagePrefix tools)"/bin/hwloc-info \
"$(getPackagePrefix tools)"/bin/hwloc-patch \
"$(getPackagePrefix tools)"/bin/hwloc-ps \
"$(getPackagePrefix tools)"/bin/lstopo-no-graphics
BUILD()
{
LDFLAGS="-lnetwork" \
runConfigure --omit-dirs "binDir sbinDir" ./configure \
--sbindir=$commandBinDir \
--enable-plugins
make $jobArgs
}
INSTALL()
{
install -d $docDir
make install
rm -f $libDir/hwloc/*.la
rm -f $libDir/libhwloc.la
prepareInstalledDevelLib libhwloc
fixPkgconfig
packageEntries devel \
$developDir \
$docDir/hwloc-*.pdf \
$manDir/man3
packageEntries tools \
$commandBinDir
install -t $docDir AUTHORS COPYING README
}
TEST()
{
export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/hwloc/.libs
make check
}