[fastcdr/jack2/fcl/ensmallen/hwloc] Update to latest release (#13559)

3 files changed, 30 insertions, 27 deletions

diff --git a/ports/hwloc/CMakeLists.txt b/ports/hwloc/CMakeLists.txt
index 1b2e1c802..9407322a6 100644
--- a/ports/hwloc/CMakeLists.txt
+++ b/ports/hwloc/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(hwloc
     LANGUAGES C
-    VERSION 1.11.7)
+    VERSION 2.2.0)
 
 configure_file(contrib/windows/hwloc_config.h include/hwloc/autogen/config.h COPYONLY)
 configure_file(contrib/windows/static-components.h include/static-components.h COPYONLY)
@@ -18,24 +18,24 @@ endif()
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/include/private/autogen/config.h "${PRIVATE_CONFIG_H}")
 
 add_library(libhwloc
-    src/base64.c
-    src/bind.c
-    src/bitmap.c
-    src/components.c
-    src/distances.c
-    src/diff.c
-    src/misc.c
-    src/pci-common.c
-    src/topology-custom.c
-    src/topology-noos.c
-    src/topology-synthetic.c
-    src/topology-windows.c
-    src/topology-x86.c
-    src/topology-xml-nolibxml.c
-    src/topology-xml.c
-    src/topology.c
-    src/traversal.c
-    src/dolib.c)
+    hwloc/base64.c
+    hwloc/bind.c
+    hwloc/bitmap.c
+    hwloc/components.c
+    hwloc/distances.c
+    hwloc/diff.c
+    hwloc/misc.c
+    hwloc/pci-common.c
+    hwloc/shmem.c
+    hwloc/topology-noos.c
+    hwloc/topology-synthetic.c
+    hwloc/topology-windows.c
+    hwloc/topology-x86.c
+    hwloc/topology-xml-nolibxml.c
+    hwloc/topology-xml.c
+    hwloc/topology.c
+    hwloc/traversal.c
+    hwloc/dolib.c)
 
 set_target_properties(libhwloc PROPERTIES DEFINE_SYMBOL _USRDLL)
 
@@ -45,7 +45,7 @@ add_executable(hwloc-info
 target_link_libraries(hwloc-info PRIVATE libhwloc)
 
 foreach(Target IN ITEMS libhwloc hwloc-info)
-    target_include_directories(${Target} PRIVATE ./include ./src ${CMAKE_CURRENT_BINARY_DIR}/include)
+    target_include_directories(${Target} PRIVATE ./include ./hwloc ${CMAKE_CURRENT_BINARY_DIR}/include)
     target_compile_definitions(${Target} PRIVATE _CRT_SECURE_NO_WARNINGS)
 endforeach(Target)
 
diff --git a/ports/hwloc/CONTROL b/ports/hwloc/CONTROL
index f2bf754b7..f2a7afc6b 100644
--- a/ports/hwloc/CONTROL
+++ b/ports/hwloc/CONTROL
@@ -1,6 +1,6 @@
 Source: hwloc
-Version: 1.11.7-4
+Version: 2.2.0
 Homepage: https://github.com/open-mpi/hwloc
 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. 
-Supports: !uwp
\ No newline at end of file
+Supports: !(uwp|arm|arm64)
\ No newline at end of file
diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake
index 540255222..47036a028 100644
--- a/ports/hwloc/portfile.cmake
+++ b/ports/hwloc/portfile.cmake
@@ -1,10 +1,10 @@
-vcpkg_fail_port_install(ON_TARGET "UWP")
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-mpi/hwloc
-    REF hwloc-1.11.7
-    SHA512 bc3a74c60bfbed1e860c2fe2b5b49956eca5cfd9c00a262f6cd3026a42ae8b5411fa296e471a95cba657d943b8853675442e796e648034398af3015e5f59476e
+    REF 263908a2c1f21c0e221a8d1f6472daf3a1fc07b9 # hwloc-2.2.0
+    SHA512 87f3d267781fd1f8907b0c080868b56943c7c2caecae5c0fbe9a55f8c5e9453bb6b7892834ba37696c1ebadd8d7bfdd5e513ea72a075211b808a1d5803ea4b8e
 )
 
 if (VCPKG_TARGET_IS_WINDOWS)
@@ -30,8 +30,11 @@ else()
     message(WARNING "${PORT} currently requires the following tool from the system package manager:\n    libtool")
 
     vcpkg_configure_make(
-            SOURCE_PATH ${SOURCE_PATH}
-            AUTOCONFIG
+        SOURCE_PATH ${SOURCE_PATH}
+        AUTOCONFIG
+        OPTIONS
+            --disable-libxml2
+            --disable-opencl
     )
     
     vcpkg_install_make()