diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-06-03 13:41:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 22:41:49 -0700 |
| commit | 5be04143eb1e37e900ad6313340e2564233e07ca (patch) | |
| tree | d2e9e669082f7d3e6ebe57a0de6bb6ef05b17379 | |
| parent | 37ab61094760a4ec44eaeb9b58de1d78aa23154b (diff) | |
| download | vcpkg-5be04143eb1e37e900ad6313340e2564233e07ca.tar.gz vcpkg-5be04143eb1e37e900ad6313340e2564233e07ca.zip | |
[libfabric] Only support dynamic build (#11647)
| -rw-r--r-- | ports/libfabric/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libfabric/portfile.cmake | 13 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 1 |
3 files changed, 6 insertions, 11 deletions
diff --git a/ports/libfabric/CONTROL b/ports/libfabric/CONTROL index 5f49f2dff..267fb717a 100644 --- a/ports/libfabric/CONTROL +++ b/ports/libfabric/CONTROL @@ -1,5 +1,6 @@ Source: libfabric
-Version: 1.8.1
+Version: 1.8.1-1
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://github.com/ofiwg/libfabric
Build-Depends: networkdirect-sdk (windows)
+Supports: windows&x64&(!static)
\ No newline at end of file diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake index 301807b40..a5bfffc66 100644 --- a/ports/libfabric/portfile.cmake +++ b/ports/libfabric/portfile.cmake @@ -1,9 +1,6 @@ -include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "x86")
-if (VCPKG_CMAKE_SYSTEM_NAME)
- # The library supports Linux/Darwin/BSD, it is just not yet added here
- message(FATAL_ERROR "vcpkg libfabric currently suports windows. Please consider a pull request to add additional support!")
-endif()
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -15,10 +12,6 @@ vcpkg_from_github( add_additional_includes.patch
)
-if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
- message(FATAL_ERROR "VCPKG BUILD ERROR: libfabric only supports x64")
-endif()
-
set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v141")
set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v141")
@@ -43,4 +36,4 @@ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) file(RENAME ${CURRENT_PACKAGES_DIR}/includetemp ${CURRENT_PACKAGES_DIR}/include/libfabric)
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libfabric RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 700df9d8e..06ac3d996 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -743,6 +743,7 @@ libfabric:x64-linux=fail libfabric:x64-osx=fail
libfabric:x64-uwp=fail
libfabric:x64-windows=ignore
+libfabric:x64-windows-static=fail
libfreenect2:arm64-windows=fail
libgd:x64-linux=ignore
libgit2:arm-uwp=fail
|