diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 4c2814f2e55826..da3a4b734c0c99 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,5 +1,5 @@ Source: eastl -Version: 3.16.07 +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/fix_cmake_install.patch b/ports/eastl/fix_cmake_install.patch index bc8433c075429b..a2dbfd8215744d 100644 --- a/ports/eastl/fix_cmake_install.patch +++ b/ports/eastl/fix_cmake_install.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8171cd..44120cc 100644 +index e8700dc..6d3e2f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,12 +4,17 @@ @@ -20,7 +20,7 @@ index b8171cd..44120cc 100644 #------------------------------------------------------------------------------------------- # Compiler Flags #------------------------------------------------------------------------------------------- -@@ -41,10 +46,46 @@ add_definitions(-DEASTL_OPENSOURCE=1) +@@ -41,7 +46,10 @@ add_definitions(-DEASTL_OPENSOURCE=1) #------------------------------------------------------------------------------------------- # Include dirs #------------------------------------------------------------------------------------------- @@ -32,7 +32,10 @@ index b8171cd..44120cc 100644 #------------------------------------------------------------------------------------------- # Dependencies - #------------------------------------------------------------------------------------------- +@@ -50,5 +58,39 @@ if (NOT TARGET EABase) + add_subdirectory(test/packages/EABase) + endif() + -target_link_libraries(EASTL EABase) +target_link_libraries(EASTL PUBLIC EABase) + @@ -62,10 +65,11 @@ index b8171cd..44120cc 100644 + +install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") +install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - ++ +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake" + DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION} +) + diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index a446670a546947..1bef06c771a740 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 1cf6182218bec79ece0b91e762f507e8c027807c # 3.16.07 - SHA512 a0d140a6ff202eb9360a7cbb4ae59881458b628a7bc5ffb19864aba585fd0b02c7f7a2692df2e1c52aa58bc3c3471f27b365fa7770b7d84c038d24884db10b9b + REF 41bd2e4466e33b979d2afc37f9b98dacf1eab50b #v 3.17.03 + SHA512 3011a0a08701b683e22cc624167b4f65fce8b16d0f7a03675f6a1d5b02313c5b763bcc6c8091f65728ed60ceee8d585cbdb1968a35fb24954f4f66afabb23865 HEAD_REF master PATCHES fix_cmake_install.patch