diff --git a/sys-libs/hwloc/hwloc-1.11.8.recipe b/sys-libs/hwloc/hwloc-1.11.11.recipe similarity index 96% rename from sys-libs/hwloc/hwloc-1.11.8.recipe rename to sys-libs/hwloc/hwloc-1.11.11.recipe index 75ff215d4..63a3a6b42 100644 --- a/sys-libs/hwloc/hwloc-1.11.8.recipe +++ b/sys-libs/hwloc/hwloc-1.11.11.recipe @@ -29,14 +29,14 @@ Stuttgart LICENSE="BSD (3-clause)" REVISION="1" SOURCE_URI="https://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-$portVersion.tar.bz2" -CHECKSUM_SHA256="ecef10265084d9123dc0b03d82ff5ee06fbf5ba755a912e7511ae590c9ee594d" +CHECKSUM_SHA256="16a061cabd9319eb8cf9c6705c79142520b5b38d28a3f2a1d832bcb2fb7ea5fd" PATCHES="hwloc-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="5.7.5" -libVersionCompat="$libVersion compat >= 5" +libVersion="5.7.8" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" hwloc$secondaryArchSuffix = $portVersion diff --git a/sys-libs/hwloc/patches/hwloc-1.11.8.patchset b/sys-libs/hwloc/patches/hwloc-1.11.11.patchset similarity index 93% rename from sys-libs/hwloc/patches/hwloc-1.11.8.patchset rename to sys-libs/hwloc/patches/hwloc-1.11.11.patchset index f4058028b..f7ba48222 100644 --- a/sys-libs/hwloc/patches/hwloc-1.11.8.patchset +++ b/sys-libs/hwloc/patches/hwloc-1.11.11.patchset @@ -5,7 +5,7 @@ Subject: Remove unknown compiler parameter (gcc2) diff --git a/config/hwloc_internal.m4 b/config/hwloc_internal.m4 -index 0c54667..6ba7bf4 100644 +index b944109..030289d 100644 --- a/config/hwloc_internal.m4 +++ b/config/hwloc_internal.m4 @@ -219,7 +219,6 @@ EOF @@ -17,10 +17,10 @@ index 0c54667..6ba7bf4 100644 add="$add -Wcomment -pedantic -Wshadow" diff --git a/configure b/configure -index cef42d0..e5e1a43 100755 +index b1fa5d1..308fa66 100755 --- a/configure +++ b/configure -@@ -16373,7 +16373,6 @@ $as_echo "no (default)" >&6; } +@@ -16510,7 +16510,6 @@ $as_echo "no (default)" >&6; } fi fi if test "$hwloc_want_picky" = 1; then