Skip to content

[yato] fix arm build by updating #23406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 1 commit into from
Mar 11, 2022
Merged

[yato] fix arm build by updating #23406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions ports/yato/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_bitbucket(
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alexey_gruzdev/yato
REF v1.0
SHA512 631b870fd2704a03d9d66ef244f4e50968ae63da4fda0c7cd1f6ce2cea2b1e8b4506b0148cd1af1e133a70fd5d9cdc9d8c054edac6141118ee3c9427e186b270
REPO agruzdev/Yato
REF 9b5a49f6ec4169b67b9e5ffd11fdae9c238b0a3d
SHA512 41962839cd13a314a17fef5f6065d7c3ed9967832039ca31993105685d584307d00f17c1514f4acf855a71fd884a1104c2d9c6a4461be5d2d7cfdc50b1ea7bdb
HEAD_REF master
)

Expand All @@ -17,24 +17,15 @@ file(COPY "${SOURCE_PATH}/modules/config/yato"
DESTINATION "${CURRENT_PACKAGES_DIR}/include"
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DYATO_BUILD_TESTS:BOOL=OFF
-DYATO_BUILD_ACTORS:BOOL=ON
-DYATO_BUILD_CONFIG:BOOL=ON
-DYATO_CONFIG_MANUAL:BOOL=ON
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
)

vcpkg_build_cmake()
vcpkg_cmake_build()

# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/yato)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/yato/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/yato/copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
13 changes: 10 additions & 3 deletions ports/yato/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"name": "yato",
"version-string": "1.0",
"port-version": 3,
"description": "Modern C++14 containers and utilities, actors system, typesafe config"
"version-date": "2022-03-06",
"description": "Modern C++14 containers and utilities, actors system, typesafe config",
"license": "Apache-2.0",
"supports": "!(windows & arm)",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,9 +1360,6 @@ yajl:arm-uwp=fail
yajl:x64-uwp=fail
yara:arm-uwp=fail
yara:x64-uwp=fail
yato:arm64-windows=fail
yato:arm-uwp=fail
yato:x64-uwp=fail
z3:arm-uwp=fail
z3:x64-uwp=fail

Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7533,8 +7533,8 @@
"port-version": 1
},
"yato": {
"baseline": "1.0",
"port-version": 3
"baseline": "2022-03-06",
"port-version": 0
},
"yoga": {
"baseline": "1.19.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/y-/yato.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "302773e4845f27896621a44a76a964baec26f3e8",
"version-date": "2022-03-06",
"port-version": 0
},
{
"git-tree": "8605c052211c8394b3f3a524ffe071307582a941",
"version-string": "1.0",
Expand Down