[spdk-isal] only linux (#22451)

This commit is contained in:
autoantwort 2022-01-27 00:27:17 +01:00 committed by GitHub
parent ff99d5c7e0
commit 08ea1c5287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 102 deletions

View File

@ -1,56 +0,0 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
PROJECT(isal C)
IF (SOURCE_PATH)
SET(CMAKE_SOURCE_DIR ${SOURCE_PATH})
ENDIF ()
INCLUDE(ProcessorCount)
PROCESSORCOUNT(PROCS)
FIND_PROGRAM(NASM nasm)
IF (NOT NASM)
MESSAGE(FATAL_ERROR "NASM not found")
ENDIF ()
FIND_PROGRAM(YASM yasm)
IF (NOT YASM)
MESSAGE(FATAL_ERROR "YASM not found")
ENDIF ()
IF (EXEC_ENV STREQUAL "Windows")
FIND_PROGRAM(MAKE nmake)
IF (NOT MAKE)
MESSAGE(FATAL_ERROR "nmake not found")
ENDIF ()
ELSEIF(EXEC_ENV STREQUAL "Linux")
FIND_PROGRAM(MAKE make)
IF (NOT MAKE)
MESSAGE(FATAL_ERROR "MAKE not found")
ENDIF ()
ENDIF()
SET(MAKE_FLAGS "-f")
IF (EXEC_ENV STREQUAL Windows)
STRING(APPEND MAKE_FLAGS " Makefile.nmake /E CC=cl AS=nasm")
ELSEIF (EXEC_ENV STREQUAL Linux)
STRING(APPEND MAKE_FLAGS "Makefile.unx")
ENDIF ()
ADD_CUSTOM_TARGET(isal ALL
COMMAND ${MAKE} ${MAKE_FLAGS}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/
)
SET(LIB_PATH ${CMAKE_SOURCE_DIR}/bin/)
IF (LIBRARY_LINKAGE STREQUAL "dynamic")
STRING(APPEND LIB_PATH isal.so)
ELSEIF (LIBRARY_LINKAGE STREQUAL "static")
STRING(APPEND LIB_PATH isa-l.a)
ELSE ()
MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}")
ENDIF ()
INSTALL(FILES ${LIB_PATH}
DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/)

View File

@ -1,21 +1,5 @@
IF (NOT VCPKG_CMAKE_SYSTEM_NAME)
SET(EXEC_ENV "Windows")
ELSE ()
SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}")
ENDIF ()
IF (NOT EXEC_ENV STREQUAL "Linux")
MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports Linux platforms")
MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows")
ENDIF ()
IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports x64 architecture")
ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
ENDIF ()
VCPKG_FROM_GITHUB(
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO spdk/isa-l
REF spdk
@ -23,26 +7,20 @@ VCPKG_FROM_GITHUB(
HEAD_REF master
)
VCPKG_FIND_ACQUIRE_PROGRAM(NASM)
GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY)
SET(ENV{PATH} "$ENV{PATH};${NASM_PATH}")
vcpkg_find_acquire_program(NASM)
get_filename_component(NASM_PATH ${NASM} DIRECTORY)
vcpkg_add_to_path("${NASM_PATH}")
VCPKG_FIND_ACQUIRE_PROGRAM(YASM)
vcpkg_find_acquire_program(YASM)
VCPKG_CONFIGURE_CMAKE(
SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
PREFER_NINJA
OPTIONS
-DSOURCE_PATH=${SOURCE_PATH}
-DEXEC_ENV:STRING=${EXEC_ENV}
-DLIBRARY_LINKAGE:STRING=${VCPKG_LIBRARY_LINKAGE}
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
)
VCPKG_INSTALL_CMAKE()
vcpkg_install_make()
FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/spdk)
FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/spdk)
FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/spdk-isalConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/spdk-isalConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,8 @@
{
"name": "spdk-isal",
"version-string": "20181006",
"port-version": 1,
"port-version": 2,
"description": "SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library",
"supports": "x64"
"license": "BSD-3-Clause",
"supports": "!windows & !(osx & x64)"
}

View File

@ -1264,14 +1264,6 @@ spdk-ipsec:x64-windows=fail
spdk-ipsec:x64-windows-static=fail
spdk-ipsec:x64-windows-static-md=fail
spdk-ipsec:x86-windows=fail
spdk-isal:arm64-windows=fail
spdk-isal:arm-uwp=fail
spdk-isal:x64-osx=fail
spdk-isal:x64-uwp=fail
spdk-isal:x64-windows=fail
spdk-isal:x64-windows-static=fail
spdk-isal:x64-windows-static-md=fail
spdk-isal:x86-windows=fail
spirv-tools:arm-uwp=fail
spirv-tools:x64-uwp=fail
stormlib:arm-uwp=fail

View File

@ -6542,7 +6542,7 @@
},
"spdk-isal": {
"baseline": "20181006",
"port-version": 1
"port-version": 2
},
"spdlog": {
"baseline": "1.9.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "de270891534b1e4332e4cfbd67437653a9217823",
"version-string": "20181006",
"port-version": 2
},
{
"git-tree": "a3b83f2844457a26c4f286c651a85ec6b5cc43e2",
"version-string": "20181006",