Skip to content

[libffi] Don't replace string in file that doesn't exist. #20554

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
ras0219-msft merged 4 commits into from
Oct 7, 2021
Merged

[libffi] Don't replace string in file that doesn't exist. #20554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
882a61f
Don't replace string in file that doesn't exist.
larshg Oct 6, 2021
02a4798
Update per bot.
larshg Oct 6, 2021
928ca6c
Update per bot again.
larshg Oct 6, 2021
5f89daf
Address comments.
larshg Oct 7, 2021
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
19 changes: 12 additions & 7 deletions ports/libffi/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ vcpkg_from_github(
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURCE_PATH}")

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
Expand All @@ -20,7 +20,7 @@ vcpkg_configure_cmake(
-DFFI_SKIP_HEADERS=ON
)

vcpkg_install_cmake()
vcpkg_cmake_install()

# Create pkgconfig file
set(PACKAGE_VERSION ${VERSION})
Expand All @@ -43,12 +43,17 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
endif()

vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()
vcpkg_cmake_config_fixup()

if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc"
"-lffi" "-llibffi")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc"
"-lffi" "-llibffi")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc"
"-lffi" "-llibffi")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc"
"-lffi" "-llibffi")
endif()
endif()
vcpkg_fixup_pkgconfig()

Expand Down
14 changes: 12 additions & 2 deletions ports/libffi/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
{
"name": "libffi",
"version": "3.4.2",
"port-version": 1,
"port-version": 2,
"description": "Portable, high level programming interface to various calling conventions",
"homepage": "https://github.com/libffi/libffi"
"homepage": "https://github.com/libffi/libffi",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
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 @@ -3354,7 +3354,7 @@
},
"libffi": {
"baseline": "3.4.2",
"port-version": 1
"port-version": 2
},
"libfido2": {
"baseline": "1.7.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": "8fbd8bfde2d551ad1be625223a92997704469a8e",
"version": "3.4.2",
"port-version": 2
},
{
"git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456",
"version": "3.4.2",
Expand Down