From d279fe340eeb6b8459277c2e3d95b0d69946c976 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 8 Oct 2024 15:51:03 +0200 Subject: [PATCH] Fix options --- ports/py-meson/portfile.cmake | 4 +--- ports/py-pyyaml/portfile.cmake | 2 +- versions/p-/py-meson.json | 2 +- versions/p-/py-pyyaml.json | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ports/py-meson/portfile.cmake b/ports/py-meson/portfile.cmake index e427f8f..7bcbd54 100755 --- a/ports/py-meson/portfile.cmake +++ b/ports/py-meson/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_from_github( HEAD_REF main ) -#vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) - set(VCPKG_BUILD_TYPE release) vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}") @@ -25,4 +23,4 @@ vcpkg_python_test_import(MODULE "mesonpy") configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg_mesonpy_prepare_build_options.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/py-pyyaml/portfile.cmake b/ports/py-pyyaml/portfile.cmake index 2d98912..841dce8 100644 --- a/ports/py-pyyaml/portfile.cmake +++ b/ports/py-pyyaml/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_pythonhosted( cy-me-a-river.patch ) -vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -x) +vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/versions/p-/py-meson.json b/versions/p-/py-meson.json index a5d2a05..68704d5 100644 --- a/versions/p-/py-meson.json +++ b/versions/p-/py-meson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "037e6e158549e2b6eb20bf2d74553bb922fcb0c7", + "git-tree": "492c2cf2e21e3339e428c8ac609d556f87847d27", "version": "0.15.0", "port-version": 0 } diff --git a/versions/p-/py-pyyaml.json b/versions/p-/py-pyyaml.json index 3a2adad..446952b 100644 --- a/versions/p-/py-pyyaml.json +++ b/versions/p-/py-pyyaml.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d856508907cfd33d3b996a98ade19c45d45ecb80", + "git-tree": "3ffce016706b9faa8fca31f5015ec69bcef52953", "version": "6.0.1", "port-version": 2 },