diff options
| author | MidwestB <nintandrew13@yahoo.com> | 2021-08-30 20:19:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 18:19:44 -0700 |
| commit | 81274424886a412047e8302dc25d0541733088eb (patch) | |
| tree | a6acdadce7682ed2611d5b76265089ad7b1c2c33 | |
| parent | 3f3cf1e30430afc10e882a1ad443fee7cd4b5324 (diff) | |
| download | vcpkg-81274424886a412047e8302dc25d0541733088eb.tar.gz vcpkg-81274424886a412047e8302dc25d0541733088eb.zip | |
[libffi] Use -llibffi on Windows (#19655)
* Use -llibffi on Windows
Replace -lffi with -llibffi for Windows development, not just mingw
* Update portfile.cmake
* Update baseline.json
* Update libffi.json
* Add port-version and make path quoted
* Update version files
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
| -rw-r--r-- | ports/libffi/portfile.cmake | 16 | ||||
| -rw-r--r-- | ports/libffi/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libffi.json | 5 |
4 files changed, 15 insertions, 9 deletions
diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 8a9c69489..ba5d4d88c 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -8,11 +8,11 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in DESTINATION ${SOURCE_PATH}) +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( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h @@ -44,16 +44,16 @@ endif() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() -if(VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc +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 + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" "-lffi" "-llibffi") endif() vcpkg_fixup_pkgconfig() if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ffi.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h" " *know* they are going to link with the static library. */" " *know* they are going to link with the static library. */ @@ -62,4 +62,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) ) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 1b015d403..80481cdb7 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libffi", "version": "3.4.2", + "port-version": 1, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi" } diff --git a/versions/baseline.json b/versions/baseline.json index bf1ff7b26..1d771b70b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3206,7 +3206,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 0 + "port-version": 1 }, "libfido2": { "baseline": "1.7.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index f866b7686..52f85d99d 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456", + "version": "3.4.2", + "port-version": 1 + }, + { "git-tree": "683012a89ed0185eecbc3035b2490af7d2cd2379", "version": "3.4.2", "port-version": 0 |