Skip to content

[libffi] Use full CCAS path #44174

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
JavierMatosD merged 2 commits into from
Mar 7, 2025
Merged

[libffi] Use full CCAS path #44174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10361bf
[libffi] Use full CCAS path
dg0yt Mar 5, 2025
e699b2b
CI
dg0yt Mar 6, 2025
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
14 changes: 7 additions & 7 deletions ports/libffi/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ endif()
set(ccas_options "")
vcpkg_cmake_get_vars(cmake_vars_file)
include("${cmake_vars_file}")
set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(ccas "${SOURCE_PATH}/msvcc.sh")
vcpkg_add_to_path("${SOURCE_PATH}")
set(ccas "msvcc.sh")
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
string(APPEND ccas_options " -m32")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
Expand All @@ -33,13 +35,11 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
string(APPEND ccas_options " -marm64")
endif()
else()
set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
endif()
cmake_path(GET ccas PARENT_PATH ccas_dir)
vcpkg_add_to_path("${ccas_dir}")
cmake_path(GET ccas FILENAME ccas_command)
vcpkg_list(APPEND options "CCAS=${ccas_command}${ccas_options}")
vcpkg_list(APPEND options "CCAS=${ccas}")
if(ccas_options)
vcpkg_list(APPEND options "CCASFLAGS=\${CCASFLAGS}${ccas_options}")
endif()

set(configure_triplets DETERMINE_BUILD_TRIPLET)
if(VCPKG_TARGET_IS_EMSCRIPTEN)
Expand Down
1 change: 1 addition & 0 deletions ports/libffi/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "libffi",
"version": "3.4.7",
"port-version": 1,
"description": "Portable, high level programming interface to various calling conventions",
"homepage": "https://github.com/libffi/libffi",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4562,7 +4562,7 @@
},
"libffi": {
"baseline": "3.4.7",
"port-version": 0
"port-version": 1
},
"libfido2": {
"baseline": "1.15.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libffi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "710c324f0b7822714000ae5b5ff818ab98380f91",
"version": "3.4.7",
"port-version": 1
},
{
"git-tree": "5cd61965ff1cc223c5592da1dbc48b45a26f3705",
"version": "3.4.7",
Expand Down