[hwloc] update to 2.7.0 (#22060)

* [hwloc] update to 2.7.0 * update version * update patch * update version * fix-osx-support * update version * set CoreFoundation * update version * reset CoreFoundation * update version * [hpx] Fix dependency hwloc * version * [hpx] Add osx component iokit * overwrite hpx version * version * update version * osx support * overwrite version * add license * format-manifest * update version * add license * update version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2024-12-28 03:10:57 +08:00 · 2022-02-16 08:59:58 +08:00 · 2022-02-16 08:59:58 +08:00 · 87179c1b43
commit 87179c1b43
parent 9341313ad2
9 changed files with 47 additions and 45 deletions
--- a/ports/hpx/fix-dependency-hwloc.patch
+++ b/ports/hpx/fix-dependency-hwloc.patch
@ -0,0 +1,15 @@
+diff --git a/cmake/FindHwloc.cmake b/cmake/FindHwloc.cmake
+index cdede78..6967abf 100644
+--- a/cmake/FindHwloc.cmake
+++ b/cmake/FindHwloc.cmake
+@@ -71,6 +71,9 @@ if(NOT TARGET Hwloc::hwloc)
+   add_library(Hwloc::hwloc INTERFACE IMPORTED)
+   target_include_directories(Hwloc::hwloc SYSTEM INTERFACE ${HWLOC_INCLUDE_DIR})
+   target_link_libraries(Hwloc::hwloc INTERFACE ${HWLOC_LIBRARIES})
+-
+  if(APPLE)
+     target_link_libraries(Hwloc::hwloc INTERFACE  "-framework CoreFoundation" "-framework IOKit")
+  endif()
+  
+   mark_as_advanced(HWLOC_ROOT HWLOC_LIBRARY HWLOC_INCLUDE_DIR)
+ endif()
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@ -1,4 +1,3 @@
-
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

 vcpkg_from_github(
@ -7,6 +6,7 @@ vcpkg_from_github(
    REF 1.7.1
    SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3
    HEAD_REF stable
+    PATCHES fix-dependency-hwloc.patch
 )

 set(HPX_WITH_MALLOC system)
--- a/ports/hpx/vcpkg.json
+++ b/ports/hpx/vcpkg.json
@ -1,12 +1,13 @@
 {
  "name": "hpx",
  "version-semver": "1.7.1",
-  "port-version": 3,
+  "port-version": 4,
  "description": [
    "The C++ Standards Library for Concurrency and Parallelism",
    "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case."
  ],
  "homepage": "https://github.com/STEllAR-GROUP/hpx",
+  "license": "BSL-1.0",
  "dependencies": [
    "asio",
    "boost-accumulators",
--- a/ports/hwloc/fix_shared_win_build.patch
+++ b/ports/hwloc/fix_shared_win_build.patch
@ -1,56 +1,30 @@
 diff --git a/configure.ac b/configure.ac
-index 44180d1aa..6bba9c435 100644
+index 8af26ec..0d52b00 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -101,10 +101,11 @@ AM_PROG_CC_C_O
- m4_version_prereq([2.70], [], [AC_PROG_CC_C99])
- CFLAGS=$CFLAGS_save
- 
-AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
-AS_IF([test -z "$CC_FOR_BUILD"],[
-    AC_SUBST([CC_FOR_BUILD], [$CC])
-])
-+# only needed to run/build dolib.exe which can be replaced with a bash script....
-+# AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
-+# AS_IF([test -z "$CC_FOR_BUILD"],[
-+#     AC_SUBST([CC_FOR_BUILD], [$CC])
-+# ])
- 
- ####################################################################
- # CLI arguments
-@@ -132,6 +133,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"],
+@@ -127,6 +127,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"],
 ####################################################################
 
 AC_SUBST([libhwloc_so_version])
 +libhwloc_so_version_current_minus_age=`expr [[ $libhwloc_so_version=~ ([[:digit:]]+):[[:digit:]]+:([[:digit:]]+) ]] && real_so_ver=$(expr ${BASH_REMATCH[1]} - ${BASH_REMATCH[2]})`
 +AC_SUBST(libhwloc_so_version_current_minus_age)
+ AC_SUBST([libhwloc_so_name])
 
 # Setup the hwloc core
- HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot build hwloc core])], [1])
 diff --git a/hwloc/Makefile.am b/hwloc/Makefile.am
-index 48cc81c5b..5aac67d4f 100644
+index 4b3800a..f96473c 100644
 --- a/hwloc/Makefile.am
 +++ b/hwloc/Makefile.am
-@@ -191,16 +191,15 @@ if HWLOC_HAVE_WINDOWS
+@@ -189,11 +189,10 @@ if HWLOC_HAVE_WINDOWS
 
 LC_MESSAGES=C
 export LC_MESSAGES
 -ldflags += -Xlinker --output-def -Xlinker .libs/libhwloc.def
 
 if HWLOC_HAVE_MS_LIB
-dolib$(EXEEXT): dolib.c
-	$(CC_FOR_BUILD) $< -o $@
-.libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT)
-	[ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib
-+# dolib$(EXEEXT): dolib.c
-+# 	$(CC_FOR_BUILD) $< -o $@
-+# .libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT)
-+#	[ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib
-+.libs/libhwloc.lib: libhwloc.la
-+	[ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" /machine:$(HWLOC_MS_LIB_ARCH) /def:.libs/libhwloc.def /name:libhwloc-$(libhwloc_so_version_current_minus_age) /out:.libs/libhwloc.lib
+ .libs/libhwloc.lib: libhwloc.la
+-	[ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib
+#	[ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" -machine:$(HWLOC_MS_LIB_ARCH) -def:.libs/libhwloc.def -name:libhwloc-$(libhwloc_so_name) -out:.libs/libhwloc.lib
 all-local: .libs/libhwloc.lib
-clean-local:
-	$(RM) dolib$(EXEEXT)
 endif HWLOC_HAVE_MS_LIB
 
- install-exec-hook:
--- a/ports/hwloc/portfile.cmake
+++ b/ports/hwloc/portfile.cmake
@ -1,10 +1,10 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO open-mpi/hwloc
-    REF 5e185ccfff2728fa351cea41f6d9fefebfb88078 # hwloc-2.5.0
-    SHA512 96f6421c40eede3a3c273a1ffa06accc43767421d5fb7b402a83caea1ef1a3bb8282c08ed94bc696296f37f3df80cd86403dac1012f2218b674569c8afcf3de9
-    PATCHES fix_wrong_ifdef.patch
-            fix_shared_win_build.patch
+    REF 6fa8466a9c9c28de8ca3bd9e879c426edd85decf # hwloc-2.7.0
+    SHA512 33bcc30362ba27076eacc83327a9d6235e2914a3c64536631e05e2d44c2c12b0176d55cc42ec0dc3c80682b977a83e60bd3a41f3ef486581cf8afa62ad2e9516
+    PATCHES
+        fix_shared_win_build.patch
 )

 if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
@ -14,6 +14,8 @@ endif()

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
    list(APPEND OPTIONS "HWLOC_LDFLAGS=-no-undefined")
+elseif(VCPKG_TARGET_IS_OSX)
+    list(APPEND OPTIONS "HWLOC_LDFLAGS=-framework CoreFoundation")
 endif()

 vcpkg_configure_make(
--- a/ports/hwloc/vcpkg.json
+++ b/ports/hwloc/vcpkg.json
@ -1,12 +1,12 @@
 {
  "name": "hwloc",
-  "version": "2.5.0",
-  "port-version": 3,
+  "version": "2.7.0",
  "maintainers": "bgoglin<Brice.Goglin@inria.fr>",
  "description": [
    "Portable Hardware Locality (hwloc)",
    "The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs."
  ],
  "homepage": "https://github.com/open-mpi/hwloc",
+  "license": "BSD-2-Clause",
  "supports": "!uwp"
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2722,7 +2722,7 @@
    },
    "hpx": {
      "baseline": "1.7.1",
-      "port-version": 3
+      "port-version": 4
    },
    "http-parser": {
      "baseline": "2.9.4",
@ -2737,8 +2737,8 @@
      "port-version": 8
    },
    "hwloc": {
-      "baseline": "2.5.0",
-      "port-version": 3
+      "baseline": "2.7.0",
+      "port-version": 0
    },
    "hyperscan": {
      "baseline": "5.3.0",
--- a/versions/h-/hpx.json
+++ b/versions/h-/hpx.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "815641d6119376c546119a841f6c035e8f27b8da",
+      "version-semver": "1.7.1",
+      "port-version": 4
+    },
    {
      "git-tree": "ca0e813d228cd5ea6e5c05ae81e7e89e825783d0",
      "version-semver": "1.7.1",
--- a/versions/h-/hwloc.json
+++ b/versions/h-/hwloc.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "22d2c0f63d27b10b032eb6cb3bd07055300fc961",
+      "version": "2.7.0",
+      "port-version": 0
+    },
    {
      "git-tree": "fda6ebfe17a601d067ee6809571bedbedb590eef",
      "version": "2.5.0",