mirror of https://github.com/microsoft/vcpkg.git
[libffi] Don't replace string in file that doesn't exist. (#20554)
* Don't replace string in file that doesn't exist. * Update per bot. * Update per bot again. * Address comments.
This commit is contained in:
parent
b1e54e881b
commit
92770f60d0
|
|
@ -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
|
||||
|
|
@ -20,7 +20,7 @@ vcpkg_configure_cmake(
|
|||
-DFFI_SKIP_HEADERS=ON
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
|
||||
# Create pkgconfig file
|
||||
set(PACKAGE_VERSION ${VERSION})
|
||||
|
|
@ -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()
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3354,7 +3354,7 @@
|
|||
},
|
||||
"libffi": {
|
||||
"baseline": "3.4.2",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"libfido2": {
|
||||
"baseline": "1.7.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e",
|
||||
"version": "3.4.2",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456",
|
||||
"version": "3.4.2",
|
||||
|
|
|
|||
Loading…
Reference in New Issue