diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-05-27 06:42:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 21:42:12 -0700 |
| commit | 924eb894784f0256a6a2ca7796b3ee389a802afe (patch) | |
| tree | db7bd4dfaae25ab15d6885b77bc3abe94fe74500 /ports/nettle | |
| parent | 548822219352b55ca46dd75db683c06dcf45522a (diff) | |
| download | vcpkg-924eb894784f0256a6a2ca7796b3ee389a802afe.tar.gz vcpkg-924eb894784f0256a6a2ca7796b3ee389a802afe.zip | |
[gmp/nettle] try fixing build issues (#11565)
* [gmp/nettle] try fixing build issues
* [nettle/gmp] remove unnecessary comments
Diffstat (limited to 'ports/nettle')
| -rw-r--r-- | ports/nettle/CONTROL | 2 | ||||
| -rw-r--r-- | ports/nettle/portfile.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL index 8cbe44867..e73b0df66 100644 --- a/ports/nettle/CONTROL +++ b/ports/nettle/CONTROL @@ -1,5 +1,5 @@ Source: nettle
-Version: 3.5.1
+Version: 3.5.1-1
Homepage: https://git.lysator.liu.se/nettle/nettle
Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
Build-Depends: gmp, vs-yasm (windows)
\ No newline at end of file diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index c599f2d7c..cd50ea19c 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -12,8 +12,7 @@ if(VCPKG_TARGET_IS_WINDOWS) )
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_DIR "${YASM}" DIRECTORY)
- vcpkg_add_to_path(${YASM_DIR})
- set(ENV{YASMPATH} ${YASM_DIR}/)
+ vcpkg_add_to_path("${YASM_DIR}")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(CONFIGURATION_RELEASE ReleaseDLL)
@@ -74,6 +73,7 @@ if(VCPKG_TARGET_IS_WINDOWS) RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE}
DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG}
SKIP_CLEAN
+ OPTIONS /p:UseEnv=True
)
get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
|