[hwloc] Update to 2.9.0 (#28365)

* [hwloc] update to 2.9.0

* v db
This commit is contained in:
Alexander Neumann 2022-12-19 23:45:44 +01:00 committed by GitHub
parent 3fcf1e3cd9
commit b803111012
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 17 deletions

View File

@ -1,13 +0,0 @@
diff --git a/hwloc/topology.c b/hwloc/topology.c
index 01e5a863c..211f2cbd1 100644
--- a/hwloc/topology.c
+++ b/hwloc/topology.c
@@ -69,7 +69,7 @@
* it will break in cygwin, we'll have to use both putenv() and SetEnvironmentVariable().
* Hopefully L0 will be provide a way to enable Sysman without env vars before it happens.
*/
-#ifdef HWLOC_HAVE_ATTRIBUTE_CONSTRUCTOR
+#if HWLOC_HAVE_ATTRIBUTE_CONSTRUCTOR
static void hwloc_constructor(void) __attribute__((constructor));
static void hwloc_constructor(void)
{

View File

@ -1,10 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO open-mpi/hwloc
REF 3cf146011de099c53efee163ea7d3a059fd7bd60 # hwloc-2.7.1
SHA512 c6c4fbd3a1bea2bd1df65b7512748cd10944a255b145effe6f75d5fa2c5b1da32d344f2cbff3062391d47230e84361620c69f87500113b45992282a512be90b4
REF 42bebfa5e4b96c99c2482645c8eb86d4755ef23b
SHA512 87aff1e0eb7389a8d433f2936b6e23e8c37381d46fb7e60a205a97bc0f86f3c8926e3a6da6e54d4aeb89ef19abbe73a9d392f8c7871108b2a9fbf0b011de9f2c
PATCHES
fix_shared_win_build.patch
stdout_fileno.patch
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)

View File

@ -0,0 +1,15 @@
diff --git a/utils/lstopo/lstopo.c b/utils/lstopo/lstopo.c
index a946581c3..ecbf64aff 100644
--- a/utils/lstopo/lstopo.c
+++ b/utils/lstopo/lstopo.c
@@ -58,6 +58,10 @@
# endif
#endif
+#if _MSC_VER
+#define STDOUT_FILENO _fileno( stdout )
+#endif
+
#ifdef ANDROID
extern void setJNIEnv();
#endif

View File

@ -1,6 +1,6 @@
{
"name": "hwloc",
"version": "2.7.1",
"version": "2.9.0",
"maintainers": "bgoglin<Brice.Goglin@inria.fr>",
"description": [
"Portable Hardware Locality (hwloc)",

View File

@ -2953,7 +2953,7 @@
"port-version": 1
},
"hwloc": {
"baseline": "2.7.1",
"baseline": "2.9.0",
"port-version": 0
},
"hyperscan": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a5178039005718c78a3a9a0386fb4e6113797576",
"version": "2.9.0",
"port-version": 0
},
{
"git-tree": "3ce0161512ee6cc0ef1f2e68a6c73db63422f0ee",
"version": "2.7.1",