mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 03:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[hwloc] Support UNIX (#10615)

Browse Source 
* [hwloc] Support UNIX

* update baseline

* update baseline

* update baseline
This commit is contained in:
Jack·Boos·Yu 2020-04-25 05:10:39 +08:00 committed by GitHub
parent 56738de192
commit a048cffdf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/hwloc/CONTROL
View File

@ -1,5 +1,5 @@
Source: hwloc Source: hwloc
Version: 1.11.7-3 Version: 1.11.7-4
Homepage: https://github.com/open-mpi/hwloc Homepage: https://github.com/open-mpi/hwloc
Description: Portable Hardware Locality (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. 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.

66
ports/hwloc/portfile.cmake
View File

@ -1,35 +1,51 @@
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_fail_port_install(ON_TARGET "UWP")
message(FATAL_ERROR "UWP builds not supported")
endif()
include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO open-mpi/hwloc REPO open-mpi/hwloc
REF hwloc-1.11.7 REF hwloc-1.11.7
SHA512 bc3a74c60bfbed1e860c2fe2b5b49956eca5cfd9c00a262f6cd3026a42ae8b5411fa296e471a95cba657d943b8853675442e796e648034398af3015e5f59476e) SHA512 bc3a74c60bfbed1e860c2fe2b5b49956eca5cfd9c00a262f6cd3026a42ae8b5411fa296e471a95cba657d943b8853675442e796e648034398af3015e5f59476e
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) if (VCPKG_TARGET_IS_WINDOWS)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
OPTIONS_DEBUG )
-DHWLOC_SKIP_INCLUDES=ON)
vcpkg_install_cmake()
vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/include/hwloc/autogen/config.h PUBLIC_CONFIG_H)
file(READ ${CURRENT_PACKAGES_DIR}/include/hwloc/autogen/config.h PUBLIC_CONFIG_H) string(REPLACE "defined( DECLSPEC_EXPORTS )" "0" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}")
string(REPLACE "defined( DECLSPEC_EXPORTS )" "0" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined( _USRDLL )" "0" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}")
string(REPLACE "defined( _USRDLL )" "0" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}") else()
string(REPLACE "defined( _USRDLL )" "1" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/hwloc/autogen/config.h "${PUBLIC_CONFIG_H}")
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/tools)
else() else()
string(REPLACE "defined( _USRDLL )" "1" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}") message(WARNING "${PORT} currently requires the following tool from the system package manager:\n libtool")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/hwloc/autogen/config.h "${PUBLIC_CONFIG_H}")
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/tools) vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
)
vcpkg_install_make()
file(GLOB HWLOC_EXEC ${CURRENT_PACKAGES_DIR}/bin)
message("HWLOC_EXEC: ${HWLOC_EXEC}")
if (HWLOC_EXEC)
file(COPY ${HWLOC_EXEC} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright # Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/hwloc) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/hwloc/COPYING ${CURRENT_PACKAGES_DIR}/share/hwloc/copyright)

3
scripts/ci.baseline.txt
View File

@ -597,10 +597,9 @@ hidapi:x64-uwp=fail
hiredis:arm-uwp=fail hiredis:arm-uwp=fail
hiredis:x64-uwp=fail hiredis:x64-uwp=fail
hpx:x64-windows-static=fail hpx:x64-windows-static=fail
hpx:x64-linux=fail
hwloc:arm64-windows=fail hwloc:arm64-windows=fail
hwloc:arm-uwp=fail hwloc:arm-uwp=fail
hwloc:x64-linux=fail
hwloc:x64-osx=fail
hwloc:x64-uwp=fail hwloc:x64-uwp=fail
hyperscan:x64-linux=ignore hyperscan:x64-linux=ignore
# hypre has a conflict with 'superlu' port # hypre has a conflict with 'superlu' port