From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Sep 2023 17:01:35 +0000 (+0000)
Subject: hwloc: Update to 2.9.3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=766d46bf415ebbc0b6611d511b7a47c57995f07d;p=people%2Fstevee%2Fipfire-3.x.git

hwloc: Update to 2.9.3

This patch also fixes the testsuite by disabling the gather topology
test which runs fine in the hosted build environment, but fails on my
own build VM.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/hwloc/hwloc.nm b/hwloc/hwloc.nm
index a8b8b6137..1583947cf 100644
--- a/hwloc/hwloc.nm
+++ b/hwloc/hwloc.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = hwloc
-version    = %{ver_maj}.0
+version    = %{ver_maj}.3
 ver_maj    = 2.9
 release    = 1
 
@@ -39,9 +39,11 @@ build
 	configure_options += \
 		--enable-plugins
 
+	# Disable the gather-topology test which fails in the build environment
+	export HWLOC_TEST_GATHER_TOPOLOGY=0
+
 	test
-		LD_LIBRARY_PATH="%{DIR_APP}/hwloc/.libs" \
-			make check XFAIL_TESTS="test-gather-topology.sh"
+		make check LD_LIBRARY_PATH="%{DIR_APP}/hwloc/.libs"
 	end
 end