[gmp/nettle] try fixing build issues (#11565)

* [gmp/nettle] try fixing build issues * [nettle/gmp] remove unnecessary comments
microsoft · May 27, 2020 · 924eb89 · 924eb89
1 parent 5488222
commit 924eb89
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ports/gmp/CONTROL b/ports/gmp/CONTROL
@@ -1,5 +1,5 @@
 Source: gmp
-Version: 6.2.0
+Version: 6.2.0-1
 Homepage: https://gmplib.org/
 Description: The GNU Multiple Precision Arithmetic Library
 Build-Depends: vs-yasm (windows)
diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
@@ -11,8 +11,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)
@@ -56,6 +55,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)
     file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include")

diff --git 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)
diff --git 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)