From dbb8930ca33edd9b413f9628b8bdf190f8397c8d Mon Sep 17 00:00:00 2001
From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Date: Mon, 11 Jul 2022 16:22:28 -0700
Subject: [PATCH] [vcpkg baseline][isal, spdk-isal] Fix conflict (#25679)

* [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>
---
 ports/isal/portfile.cmake      | 4 ++++
 ports/isal/vcpkg.json          | 3 ++-
 ports/spdk-isal/portfile.cmake | 3 +++
 ports/spdk-isal/vcpkg.json     | 5 +++--
 scripts/ci.baseline.txt        | 2 ++
 versions/baseline.json         | 6 +++---
 versions/i-/isal.json          | 5 +++++
 versions/s-/spdk-isal.json     | 5 +++++
 8 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ports/isal/portfile.cmake b/ports/isal/portfile.cmake
index 8333380199..1b786f6c93 100644
--- a/ports/isal/portfile.cmake
+++ b/ports/isal/portfile.cmake
@@ -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
diff --git a/ports/isal/vcpkg.json b/ports/isal/vcpkg.json
index be4dfa9fe5..24e322b5f6 100644
--- a/ports/isal/vcpkg.json
+++ b/ports/isal/vcpkg.json
@@ -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)"
 }
diff --git a/ports/spdk-isal/portfile.cmake b/ports/spdk-isal/portfile.cmake
index 3a09af620e..1fae5d8983 100644
--- a/ports/spdk-isal/portfile.cmake
+++ b/ports/spdk-isal/portfile.cmake
@@ -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
diff --git a/ports/spdk-isal/vcpkg.json b/ports/spdk-isal/vcpkg.json
index d2caf2dfca..b1e6045d41 100644
--- a/ports/spdk-isal/vcpkg.json
+++ b/ports/spdk-isal/vcpkg.json
@@ -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)"
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index f8ecb4920b..0a3d4afe3f 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -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
diff --git a/versions/baseline.json b/versions/baseline.json
index 5760a5fdc5..b062c23249 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -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",
diff --git a/versions/i-/isal.json b/versions/i-/isal.json
index 3320325025..f6337b0b97 100644
--- a/versions/i-/isal.json
+++ b/versions/i-/isal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7fa8499c557c19920d80318d9a1999922cd28663",
+      "version": "2.25.0",
+      "port-version": 3
+    },
     {
       "git-tree": "121b0c9241ea1f704bf6cb9ad5f010f6ae732dd0",
       "version": "2.25.0",
diff --git a/versions/s-/spdk-isal.json b/versions/s-/spdk-isal.json
index 7439aac291..585b96374f 100644
--- a/versions/s-/spdk-isal.json
+++ b/versions/s-/spdk-isal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "41bee637d2dbd80179b39bb1c5b84ec1afce7304",
+      "version-date": "2018-10-06",
+      "port-version": 3
+    },
     {
       "git-tree": "de270891534b1e4332e4cfbd67437653a9217823",
       "version-string": "20181006",