[libfabric] Update to 1.22.0, support !windows (#42456)

ports/libfabric/add_additional_includes.patch

@@ -1,58 +0,0 @@
-diff --git a/libfabric.vcxproj b/libfabric.vcxproj
-index c1e1792..3acbc81 100644
---- a/libfabric.vcxproj
-+++ b/libfabric.vcxproj
-@@ -187,7 +187,7 @@
-       <Optimization>Disabled</Optimization>
-       <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <SDLCheck>true</SDLCheck>
--      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-       <CompileAs>CompileAsC</CompileAs>
-       <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
-       <C99Support>true</C99Support>
-@@ -215,7 +215,7 @@
-       <Optimization>Disabled</Optimization>
-       <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <SDLCheck>true</SDLCheck>
--      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-       <CompileAs>CompileAsC</CompileAs>
-       <DisableSpecificWarnings>4127;4200;94;4204;4221;869</DisableSpecificWarnings>
-       <C99Support>true</C99Support>
-@@ -239,7 +239,7 @@
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <SDLCheck>true</SDLCheck>
--      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
-       <C99Support>true</C99Support>
-       <ShowIncludes>false</ShowIncludes>
-@@ -265,7 +265,7 @@
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <SDLCheck>true</SDLCheck>
--      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
-       <C99Support>true</C99Support>
-       <ShowIncludes>false</ShowIncludes>
-@@ -285,7 +285,7 @@
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
--      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
-       <SDLCheck>true</SDLCheck>
-       <C99Support>true</C99Support>
-@@ -307,7 +307,7 @@
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <SDLCheck>true</SDLCheck>
--      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
-       <DisableSpecificWarnings>4127;4200;94;4204;4221;869</DisableSpecificWarnings>
-       <C99Support>true</C99Support>
-       <ShowIncludes>false</ShowIncludes>

ports/libfabric/portfile.cmake

@@ -1,28 +1,36 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ofiwg/libfabric
-    REF bcb41c462e1e38559c94096ac06e2f578b466882 # v1.13.2
+    REF v${VERSION}
+    SHA512 8242d1eec22a066b65cb99f5b96da44ce19c1dcb3db15238495b28147e8bcee70f6c0eaf5f72e1dc9e004809114a5f96ee696b9e5fc8bd9c07177b9916e35d05
     HEAD_REF master
-    SHA512 b3ea464a402aa5b470ba5478350e23682488f785a3b2cb34df02f23d1663f097285f6795ab287db40b2a544c8e3969358a23165664e1fc39542038d726212e6c
-    PATCHES
-        add_additional_includes.patch
 )
 
-set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v142")
+if(VCPKG_TARGET_IS_WINDOWS)
-set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v142")
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH libfabric.vcxproj
+        RELEASE_CONFIGURATION Release-v142
+        DEBUG_CONFIGURATION Debug-v142
+        OPTIONS
+            "/p:SolutionDir=${SOURCE_PATH}"
+    )
+    file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/libfabric")
 
-vcpkg_msbuild_install(
+else()
-    SOURCE_PATH "${SOURCE_PATH}"
+    vcpkg_configure_make(
-    PROJECT_SUBPATH libfabric.vcxproj
+        SOURCE_PATH "${SOURCE_PATH}"
-    PLATFORM "x64"
+        AUTOCONFIG
-    RELEASE_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION}
+        OPTIONS
-    DEBUG_CONFIGURATION ${LIBFABRIC_DEBUG_CONFIGURATION}
+            --with-uring=no
-    OPTIONS
+    )
-      /p:SolutionDir=${SOURCE_PATH}
+    vcpkg_install_make()
-)
+    vcpkg_fixup_pkgconfig()
-
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/libfabric")
+endif()
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

ports/libfabric/vcpkg.json

@@ -1,10 +1,10 @@
 {
   "name": "libfabric",
-  "version-semver": "1.13.2",
+  "version-semver": "1.22.0",
-  "port-version": 2,
+  "description": "Libfabric, aka Open Fabrics Interfaces (OFI), defines a communication API for high-performance parallel and distributed applications.",
-  "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.",
+  "homepage": "https://ofiwg.github.io/libfabric/",
-  "homepage": "https://github.com/ofiwg/libfabric",
+  "license": "BSD-2-Clause OR GPL-2.0-only",
-  "supports": "windows & !uwp & x64 & !static",
+  "supports": "freebsd | linux | osx | (windows & x64 & !mingw & !uwp & !(static & staticcrt))",
   "dependencies": [
     {
       "name": "networkdirect-sdk",

versions/baseline.json

@@ -4537,8 +4537,8 @@
       "port-version": 3
     },
     "libfabric": {
-      "baseline": "1.13.2",
+      "baseline": "1.22.0",
-      "port-version": 2
+      "port-version": 0
     },
     "libffi": {
       "baseline": "3.4.6",

versions/l-/libfabric.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb0fa7c989df17085d5f125bd699dcb2e51159e4",
+      "version-semver": "1.22.0",
+      "port-version": 0
+    },
     {
       "git-tree": "19c6e0eeaef3d31e6a2f722a99d418bc03275f1a",
       "version-semver": "1.13.2",