diff options
| author | Phoebe <925731795@qq.com> | 2019-10-29 02:03:30 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-10-28 11:03:30 -0700 |
| commit | 453394c3f241b1d17ac7c58f3d10ea4e45a430b6 (patch) | |
| tree | faf92bf7d9ff581630e2b190656488c5da141ca8 | |
| parent | c17a8e5462164a76766baa3941c08bab74f01ff2 (diff) | |
| download | vcpkg-453394c3f241b1d17ac7c58f3d10ea4e45a430b6.tar.gz vcpkg-453394c3f241b1d17ac7c58f3d10ea4e45a430b6.zip | |
[duktape] fix pip and pyyaml install issue (#8767)
| -rw-r--r-- | ports/duktape/CONTROL | 2 | ||||
| -rw-r--r-- | ports/duktape/portfile.cmake | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL index da9322737..8311a60a0 100644 --- a/ports/duktape/CONTROL +++ b/ports/duktape/CONTROL @@ -1,4 +1,4 @@ Source: duktape
-Version: 2.4.0-5
+Version: 2.4.0-6
Homepage: https://github.com/svaarala/duktape
Description: Embeddable Javascript engine with a focus on portability and compact footprint.
diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake index 66d1010c8..477c76c35 100644 --- a/ports/duktape/portfile.cmake +++ b/ports/duktape/portfile.cmake @@ -16,10 +16,12 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/duktapeConfig.cmake.in DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -if(CMAKE_HOST_WIN32) +if(VCPKG_TARGET_IS_WINDOWS) set(EXECUTABLE_SUFFIX ".exe") + set(PYTHON_OPTION "") else() set(EXECUTABLE_SUFFIX "") + set(PYTHON_OPTION "--user") endif() vcpkg_find_acquire_program(PYTHON2) @@ -34,9 +36,9 @@ if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX}) SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a HEAD_REF master ) - execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYFILE_PATH}/get-pip.py --user) + execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYFILE_PATH}/get-pip.py ${PYTHON_OPTION}) endif() - execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml --user) + execute_process(COMMAND ${PYTHON2_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install pyyaml ${PYTHON_OPTION}) else() execute_process(COMMAND ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX} pyyaml) endif() @@ -62,7 +64,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets() |