[eastl] fix dependency eabase (#19643)

9 files changed, 35 insertions, 14 deletions

diff --git a/ports/eabase/CONTROL b/ports/eabase/CONTROL
deleted file mode 100644
index 2855f5f2f..000000000
--- a/ports/eabase/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: eabase

-Version: 2.09.12-1

-Homepage: https://github.com/electronicarts/EABase

-Description: Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.

diff --git a/ports/eabase/fix_cmake_install.patch b/ports/eabase/fix_cmake_install.patch
index 1a81fd69f..ea83e66b2 100644
--- a/ports/eabase/fix_cmake_install.patch
+++ b/ports/eabase/fix_cmake_install.patch
@@ -36,7 +36,7 @@ index 89c6703..ab8e553 100644
 +    #-------------------------------------------------------------------------------------------
 +    target_include_directories(EABase INTERFACE
 +        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/Common>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Common>
++        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 +    )
 +
 +    # create and install an export set for eabase target as EABase::EABase
@@ -64,7 +64,7 @@ index 89c6703..ab8e553 100644
 +    )
 +
 +    install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+    install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
++    install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 +
 +    install(
 +        FILES
diff --git a/ports/eabase/vcpkg.json b/ports/eabase/vcpkg.json
new file mode 100644
index 000000000..d9032602c
--- /dev/null
+++ b/ports/eabase/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "eabase",
+  "version-string": "2.09.12",
+  "port-version": 2,
+  "description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.",
+  "homepage": "https://github.com/electronicarts/EABase"
+}
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL
deleted file mode 100644
index da3a4b734..000000000
--- a/ports/eastl/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: eastl

-Version: 3.17.03
-Homepage: https://github.com/electronicarts/EASTL

-Description: Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.

-Build-Depends: eabase

diff --git a/ports/eastl/EASTLConfig.cmake.in b/ports/eastl/EASTLConfig.cmake.in
index 6e1a8ea90..92fb2b18d 100644
--- a/ports/eastl/EASTLConfig.cmake.in
+++ b/ports/eastl/EASTLConfig.cmake.in
@@ -1,5 +1,8 @@
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+find_dependency(EABase CONFIG REQUIRED)
+
 # Provide path for scripts
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json
new file mode 100644
index 000000000..9fd13a0c8
--- /dev/null
+++ b/ports/eastl/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "eastl",
+  "version-string": "3.17.03",
+  "port-version": 1,
+  "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.",
+  "homepage": "https://github.com/electronicarts/EASTL",
+  "dependencies": [
+    "eabase"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 1d771b70b..e3f56fde3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1817,12 +1817,12 @@
       "port-version": 0
     },
     "eabase": {
-      "baseline": "2.09.12-1",
-      "port-version": 0
+      "baseline": "2.09.12",
+      "port-version": 2
     },
     "eastl": {
       "baseline": "3.17.03",
-      "port-version": 0
+      "port-version": 1
     },
     "easycl": {
       "baseline": "0.3",
diff --git a/versions/e-/eabase.json b/versions/e-/eabase.json
index fbbfcdb80..db6461091 100644
--- a/versions/e-/eabase.json
+++ b/versions/e-/eabase.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "40dfd9d387e788a7987db75e0d9fc22786b8e43b",
+      "version-string": "2.09.12",
+      "port-version": 2
+    },
+    {
       "git-tree": "171ca1fc19c06e74b273601aa815049126f84212",
       "version-string": "2.09.12-1",
       "port-version": 0
diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json
index 7e72cfba2..c525d9baa 100644
--- a/versions/e-/eastl.json
+++ b/versions/e-/eastl.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "63d695972dd9861a2726ca90361aaafac0f710f6",
+      "version-string": "3.17.03",
+      "port-version": 1
+    },
+    {
       "git-tree": "69fe302d6e81880f94a6a9b3ddb88437e42a9731",
       "version-string": "3.17.03",
       "port-version": 0