diff options
| author | Lars Glud <larshg@gmail.com> | 2021-10-07 12:22:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 03:22:47 -0700 |
| commit | 92770f60d0262a2fee7f121d795e60c9dc135855 (patch) | |
| tree | bec7c4955cf635f8b366bd987bfa7b4d97bd0857 | |
| parent | b1e54e881bf317f5ce3b58020a8e53a5a4c3ad19 (diff) | |
| download | vcpkg-92770f60d0262a2fee7f121d795e60c9dc135855.tar.gz vcpkg-92770f60d0262a2fee7f121d795e60c9dc135855.zip | |
[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.
| -rw-r--r-- | ports/libffi/portfile.cmake | 19 | ||||
| -rw-r--r-- | ports/libffi/vcpkg.json | 14 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libffi.json | 5 |
4 files changed, 30 insertions, 10 deletions
diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index ba5d4d88c..4f6a7b99a 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -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() diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 80481cdb7..4525cee7b 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -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 + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 426cbae90..7ba4b2537 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3354,7 +3354,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 1 + "port-version": 2 }, "libfido2": { "baseline": "1.7.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index 52f85d99d..5454fe15b 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e", + "version": "3.4.2", + "port-version": 2 + }, + { "git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456", "version": "3.4.2", "port-version": 1 |