diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2021-05-21 11:56:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 11:56:32 -0700 |
| commit | 49b67d9cb856424ff69f10e7721aec5299624268 (patch) | |
| tree | 673c4e1d196f1fe38a8235c259b7d4993e84b33b /ports/gmp | |
| parent | 2f9972005f61f02fa3cda7fc062d1b834b534b8d (diff) | |
| download | vcpkg-49b67d9cb856424ff69f10e7721aec5299624268.tar.gz vcpkg-49b67d9cb856424ff69f10e7721aec5299624268.zip | |
[yasm-tool] Migrate to Host Dependencies (#16478)
* [yasm-tool] Fix usage of port to be host dependencies
This allows mpg123, nettle, and gmp to support non-x86 windows manifest mode
* fix gmp
* oops
* versions update
Diffstat (limited to 'ports/gmp')
| -rw-r--r-- | ports/gmp/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/gmp/vcpkg.json | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 7c04c680f..5356098f4 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -9,13 +9,12 @@ if(VCPKG_TARGET_IS_WINDOWS) REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2
SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5
HEAD_REF master
- PATCHES
+ PATCHES
vs.build.patch
runtime.patch
- adddef.patch
+ adddef.patch
)
- include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)
yasm_tool_helper(OUT_VAR YASM)
file(TO_NATIVE_PATH "${YASM}" YASM)
@@ -42,12 +41,11 @@ if(VCPKG_TARGET_IS_WINDOWS) set(_file "${_porjectfile}")
file(READ "${_file}" _contents)
string(REPLACE [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />]]
- "<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.props\" />"
+ "<Import Project=\"${CURRENT_HOST_INSTALLED_DIR}/share/vs-yasm/yasm.props\" />"
_contents "${_contents}")
string(REPLACE [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />]]
- "<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.targets\" />"
+ "<Import Project=\"${CURRENT_HOST_INSTALLED_DIR}/share/vs-yasm/yasm.targets\" />"
_contents "${_contents}")
- string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet
file(WRITE "${_file}" "${_contents}")
vcpkg_install_msbuild(
diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 93a6303a9..3f9b609b3 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version-string": "6.2.1", - "port-version": 5, + "port-version": 6, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", @@ -15,11 +15,6 @@ "name": "yasm-tool", "host": true, "platform": "windows" - }, - { - "name": "yasm-tool-helper", - "host": true, - "platform": "windows" } ] } |