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

[vcpkg baseline][isal, spdk-isal] Fix conflict (#25679)

Browse Source 
* [vcpkg baseline][isal, spdk-isal] Fix conflict

* format vcpkg.json

* x-add-version

* apply suggestion

* x-add-version

Co-authored-by: LilyWangLL <v-lilywang@microsoft.com>
This commit is contained in:
LilyWangLL 2022-07-11 16:22:28 -07:00 committed by GitHub
parent 1c284e9aa4
commit dbb8930ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/isal/portfile.cmake
View File

@ -1,3 +1,7 @@
if(EXISTS "${CURRENT_INSTALLED_DIR}/share/spdk-isal/copyright")
message(FATAL_ERROR "'${PORT}' conflicts with 'spdk-isal'. Please remove spdk-isal:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO 01org/isa-l

3
ports/isal/vcpkg.json
View File

@ -1,8 +1,9 @@
{
"name": "isal",
"version": "2.25.0",
"port-version": 2,
"port-version": 3,
"description": "Intel(R) Intelligent Storage Acceleration Library",
"homepage": "https://github.com/intel/isa-l",
"license": "BSD-3-Clause",
"supports": "!(x86 | arm | uwp | osx)"
}

3
ports/spdk-isal/portfile.cmake
View File

@ -1,3 +1,6 @@
if(EXISTS "${CURRENT_INSTALLED_DIR}/share/isal/copyright")
message(FATAL_ERROR "'${PORT}' conflicts with 'isal'. Please remove isal:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH

5
ports/spdk-isal/vcpkg.json
View File

@ -1,8 +1,9 @@
{
"name": "spdk-isal",
"version-string": "20181006",
"port-version": 2,
"version-date": "2018-10-06",
"port-version": 3,
"description": "SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library",
"homepage": "https://github.com/spdk/isa-l",
"license": "BSD-3-Clause",
"supports": "!windows & !(osx & x64)"
}

2
scripts/ci.baseline.txt
View File

@ -369,6 +369,8 @@ intel-mkl:x86-windows=fail
irrlicht:arm64-windows=fail
irrlicht:arm-uwp=fail
irrlicht:x64-uwp=fail
# Conflict with spdk-isal
isal:x64-linux=skip
jemalloc:arm64-windows=fail
jemalloc:arm-uwp=fail
jemalloc:x64-linux=fail

6
versions/baseline.json
View File

@ -3034,7 +3034,7 @@
},
"isal": {
"baseline": "2.25.0",
"port-version": 2
"port-version": 3
},
"ismrmrd": {
"baseline": "1.5.0",
@ -6749,8 +6749,8 @@
"port-version": 1
},
"spdk-isal": {
"baseline": "20181006",
"port-version": 2
"baseline": "2018-10-06",
"port-version": 3
},
"spdlog": {
"baseline": "1.10.0",

5
versions/i-/isal.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7fa8499c557c19920d80318d9a1999922cd28663",
"version": "2.25.0",
"port-version": 3
},
{
"git-tree": "121b0c9241ea1f704bf6cb9ad5f010f6ae732dd0",
"version": "2.25.0",

5
versions/s-/spdk-isal.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "41bee637d2dbd80179b39bb1c5b84ec1afce7304",
"version-date": "2018-10-06",
"port-version": 3
},
{
"git-tree": "de270891534b1e4332e4cfbd67437653a9217823",
"version-string": "20181006",