haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

hwloc, fix build on x86_gcc2 (#5615)

Browse Source
This commit is contained in:
Schrijvers Luc
2021-01-17 16:42:15 +01:00
committed by GitHub
parent 403fa03541
commit 1e49a7f034
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sys-libs/hwloc/hwloc-1.11.11.recipe
View File

@@ -27,16 +27,18 @@ Stuttgart
(RIST)
2015-2016 Intel, Inc."
LICENSE="BSD (3-clause)"
REVISION="2"
REVISION="3"
SOURCE_URI="https://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-$portVersion.tar.bz2"
CHECKSUM_SHA256="16a061cabd9319eb8cf9c6705c79142520b5b38d28a3f2a1d832bcb2fb7ea5fd"
PATCHES="hwloc-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
@@ -66,23 +68,23 @@ CONFLICTS_devel="
PROVIDES_tools="
hwloc${secondaryArchSuffix}_tools = $portVersion
cmd:hwloc_annotate$secondaryArchSuffix = $portVersion
cmd:hwloc_assembler$secondaryArchSuffix = $portVersion
cmd:hwloc_assembler_remote$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_distances$secondaryArchSuffix = $portVersion
cmd:hwloc_distrib$secondaryArchSuffix = $portVersion
# cmd:hwloc_dump_hwdata$secondaryArchSuffix = $portVersion
# cmd:hwloc_gather_topology$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
cmd:hwloc_annotate$commandSuffix = $portVersion
cmd:hwloc_assembler$commandSuffix = $portVersion
cmd:hwloc_assembler_remote$commandSuffix = $portVersion
cmd:hwloc_bind$commandSuffix = $portVersion
cmd:hwloc_calc$commandSuffix = $portVersion
cmd:hwloc_compress_dir$commandSuffix = $portVersion
cmd:hwloc_diff$commandSuffix = $portVersion
cmd:hwloc_distances$commandSuffix = $portVersion
cmd:hwloc_distrib$commandSuffix = $portVersion
# cmd:hwloc_dump_hwdata$commandSuffix = $portVersion
# cmd:hwloc_gather_topology$commandSuffix = $portVersion
cmd:hwloc_info$commandSuffix = $portVersion
cmd:hwloc_ls$commandSuffix = $portVersion
cmd:hwloc_patch$commandSuffix = $portVersion
cmd:hwloc_ps$commandSuffix = $portVersion
cmd:lstopo$commandSuffix = $portVersion
cmd:lstopo_no_graphics$commandSuffix = $portVersion
"
REQUIRES_tools="
hwloc$secondaryArchSuffix == $portVersion base
@@ -127,6 +129,8 @@ defineDebugInfoPackage hwloc$secondaryArchSuffix \
BUILD()
{
autoreconf -vfi
LDFLAGS="-lnetwork" \
runConfigure --omit-dirs "binDir sbinDir" ./configure \
--sbindir=$commandBinDir \

32
sys-libs/hwloc/hwloc2-2.3.0.recipe
View File

@@ -28,17 +28,19 @@ COPYRIGHT="2004-2006 The Trustees of Indiana University and Indiana \
(RIST)
2015-2016 Intel, Inc."
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
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"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
@@ -68,19 +70,19 @@ CONFLICTS_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
cmd:hwloc_annotate$commandSuffix = $portVersion
cmd:hwloc_bind$commandSuffix = $portVersion
cmd:hwloc_calc$commandSuffix = $portVersion
cmd:hwloc_compress_dir$commandSuffix = $portVersion
cmd:hwloc_diff$commandSuffix = $portVersion
cmd:hwloc_distrib$commandSuffix = $portVersion
cmd:hwloc_gather_cpuid$commandSuffix = $portVersion
cmd:hwloc_info$commandSuffix = $portVersion
cmd:hwloc_ls$commandSuffix = $portVersion
cmd:hwloc_patch$commandSuffix = $portVersion
cmd:hwloc_ps$commandSuffix = $portVersion
cmd:lstopo$commandSuffix = $portVersion
cmd:lstopo_no_graphics$commandSuffix = $portVersion
"
REQUIRES_tools="
hwloc2$secondaryArchSuffix == $portVersion base