From 162e15cc20954e7b411f86756d6dd73b9ccce0f2 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Mon, 21 Dec 2020 00:53:26 -0800
Subject: [PATCH 1/6] [gmp] Update to 6.2.1-2
---
ports/gmp/portfile.cmake | 28 ++--
ports/gmp/prefix.patch | 38 -----
ports/gmp/runtime.patch | 172 ++++++++++++--------
ports/gmp/vcpkg.json | 4 +-
ports/gmp/vs.build.patch | 337 ++++++++++++++++++++-------------------
scripts/ci.baseline.txt | 2 -
6 files changed, 290 insertions(+), 291 deletions(-)
delete mode 100644 ports/gmp/prefix.patch
diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
index e566c45a6711cb..75a93d8298a348 100644
--- a/ports/gmp/portfile.cmake
+++ b/ports/gmp/portfile.cmake
@@ -6,13 +6,12 @@ if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ShiftMediaProject/gmp
- REF e140dfc8668e96d7e56cbd46467945adcc6b3cc4 #v6.2.0
- SHA512 3b646c142447946bb4556db01214ff130da917bc149946b8cf086f3b01e1cc3d664b941a30a42608799c14461b2f29e4b894b72915d723bd736513c8914729b7
+ REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2
+ SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5
HEAD_REF master
PATCHES
vs.build.patch
runtime.patch
- prefix.patch
)
include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)
@@ -33,7 +32,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
#Setup YASM integration
- set(_file "${SOURCE_PATH}/SMP/libgmp.vcxproj")
+ set(_porjectfile)
+ if(VCPKG_TARGET_IS_UWP)
+ set(_porjectfile "${SOURCE_PATH}/SMP/libgmp_winrt.vcxproj")
+ else()
+ set(_porjectfile "${SOURCE_PATH}/SMP/libgmp.vcxproj")
+ endif()
+ set(_file "${_porjectfile}")
file(READ "${_file}" _contents)
string(REPLACE [[]]
""
@@ -42,13 +47,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
""
_contents "${_contents}")
string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet
- if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}")
- STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}")
- else()
- STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}")
- STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}")
- endif()
file(WRITE "${_file}" "${_contents}")
vcpkg_install_msbuild(
@@ -85,15 +83,14 @@ if(VCPKG_TARGET_IS_WINDOWS)
else()
vcpkg_download_distfile(
ARCHIVE
- URLS https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz
- FILENAME gmp-6.2.0.tar.xz
+ URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz
+ FILENAME gmp-6.2.1.tar.xz
SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
- REF gmp-6.2.0
- )
+ REF gmp-6.2.1)
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
@@ -106,6 +103,5 @@ else()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
- # # Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
endif()
diff --git a/ports/gmp/prefix.patch b/ports/gmp/prefix.patch
deleted file mode 100644
index 611c73763f4cb0..00000000000000
--- a/ports/gmp/prefix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
-index 2c5b8cdc6..157215394 100644
---- a/SMP/libgmp.vcxproj
-+++ b/SMP/libgmp.vcxproj
-@@ -1574,14 +1574,14 @@
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmpd
-+ gmpd
- $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmpd
-+ gmpd
- $(ProjectDir)..\msvc\
- Clean
- MSB8012
-@@ -1630,14 +1630,14 @@
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmp
-+ gmp
- $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmp
-+ gmp
- $(ProjectDir)..\msvc\
- Clean
- MSB8012
diff --git a/ports/gmp/runtime.patch b/ports/gmp/runtime.patch
index b2f15d26052d3b..6e49dcd6a7407a 100644
--- a/ports/gmp/runtime.patch
+++ b/ports/gmp/runtime.patch
@@ -1,68 +1,104 @@
-diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
-index 3c774be11..e8919240b 100644
---- a/SMP/libgmp.vcxproj
-+++ b/SMP/libgmp.vcxproj
-@@ -1846,6 +1846,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -1929,6 +1930,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
- false
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -2190,6 +2192,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -2278,6 +2281,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
- false
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -2549,6 +2553,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- $(OutDir)\lib\x64\$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -2638,6 +2643,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
- false
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -2916,6 +2922,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
-+ MultiThreadedDLL
-
-
- true
-@@ -3011,6 +3018,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)
- false
-+ MultiThreadedDLL
-
-
- true
+diff --git a/SMP/smp.props b/SMP/smp.props
+index fc70bd8..d515523 100644
+--- a/SMP/smp.props
++++ b/SMP/smp.props
+@@ -86,7 +86,7 @@
+
+
+
+- lib$(RootNamespace)d
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -94,7 +94,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)d
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -118,7 +118,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -126,7 +126,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -159,6 +159,7 @@
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -177,6 +178,7 @@
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -196,6 +198,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
+@@ -219,6 +222,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
+@@ -248,6 +252,7 @@
+ SingleFile
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -273,6 +278,7 @@
+ SingleFile
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -297,6 +303,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -328,6 +335,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
index a0c93f2ab16d64..f0cbfc61a5cb40 100644
--- a/ports/gmp/vcpkg.json
+++ b/ports/gmp/vcpkg.json
@@ -1,9 +1,9 @@
{
"name": "gmp",
- "version-string": "6.2.0",
- "port-version": 5,
+ "version-string": "6.2.1-2",
"description": "The GNU Multiple Precision Arithmetic Library",
"homepage": "https://gmplib.org",
+ "supports": "!(arm | arm64)",
"dependencies": [
{
"name": "vs-yasm",
diff --git a/ports/gmp/vs.build.patch b/ports/gmp/vs.build.patch
index 69aba99398f9d9..2d5e869a0e74ff 100644
--- a/ports/gmp/vs.build.patch
+++ b/ports/gmp/vs.build.patch
@@ -1,165 +1,172 @@
-diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
-index b4e06ae42..442d82c51 100644
---- a/SMP/libgmp.vcxproj
-+++ b/SMP/libgmp.vcxproj
-@@ -1559,114 +1559,114 @@
-
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmpd
-+ gmpd
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmpd_winrt
-+ gmpd
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- libgmpd
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmpd_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ libgmpd
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- gmpd
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- gmpd_winrt
-+ gmpd
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- gmpd
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- gmpd_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ gmpd
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmp
-+ gmp
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmp_winrt
-+ gmp
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- libgmp
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libgmp_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ libgmp
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- gmp
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- gmp_winrt
-+ gmp
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- gmp
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- gmp_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ gmp
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-diff --git a/gmp.pc.in b/gmp.pc.in
-index bf1c799ad..d0c81be91 100644
---- a/gmp.pc.in
-+++ b/gmp.pc.in
-@@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library
- URL: https://gmplib.org
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lgmp
-+Libs: -L${libdir} @LIBS@
-diff --git a/gmpxx.pc.in b/gmpxx.pc.in
-index 181cc70c6..2b697ceab 100644
---- a/gmpxx.pc.in
-+++ b/gmpxx.pc.in
-@@ -9,4 +9,4 @@ URL: https://gmplib.org
- Version: @PACKAGE_VERSION@
- Requires: gmp
- Cflags: -I${includedir}
--Libs: -L${libdir} -lgmpxx
-+Libs: -L${libdir} @LIBS@
+diff --git a/SMP/smp.props b/SMP/smp.props
+index e2ed214..fc70bd8 100644
+--- a/SMP/smp.props
++++ b/SMP/smp.props
+@@ -87,7 +87,7 @@
+
+
+ lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -95,7 +95,7 @@
+
+
+ lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -103,7 +103,7 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -111,7 +111,7 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -119,7 +119,7 @@
+
+
+ lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -127,7 +127,7 @@
+
+
+ lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -135,7 +135,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -143,7 +143,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
+index 9b453a5..cb5f090 100644
+--- a/SMP/smp_winrt.props
++++ b/SMP/smp_winrt.props
+@@ -98,7 +98,7 @@
+
+
+ lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -106,7 +106,7 @@
+
+
+ lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -114,7 +114,7 @@
+
+
+ $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -122,7 +122,7 @@
+
+
+ $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -130,7 +130,7 @@
+
+
+ lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -138,7 +138,7 @@
+
+
+ lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -146,7 +146,7 @@
+
+
+ $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -154,7 +154,7 @@
+
+
+ $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/gmp.pc.in b/gmp.pc.in
+index bf1c799..d0c81be 100644
+--- a/gmp.pc.in
++++ b/gmp.pc.in
+@@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library
+ URL: https://gmplib.org
+ Version: @PACKAGE_VERSION@
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lgmp
++Libs: -L${libdir} @LIBS@
+diff --git a/gmpxx.pc.in b/gmpxx.pc.in
+index 181cc70..2b697ce 100644
+--- a/gmpxx.pc.in
++++ b/gmpxx.pc.in
+@@ -9,4 +9,4 @@ URL: https://gmplib.org
+ Version: @PACKAGE_VERSION@
+ Requires: gmp
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lgmpxx
++Libs: -L${libdir} @LIBS@
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 21d28b38c063c8..494cf6ec07720e 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -402,8 +402,6 @@ gmmlib:x64-uwp=fail
gmmlib:x64-windows=fail
gmmlib:x64-windows-static=fail
gmmlib:x86-windows=fail
-# VS 2019 16.7 broke gmp UWP https://github.com/microsoft/vcpkg/issues/13172
-gmp:x64-uwp=fail
google-cloud-cpp:arm64-windows=fail
google-cloud-cpp:arm-uwp=fail
google-cloud-cpp:x64-uwp=fail
From efde5994a936a1a8fba883f7c174db72ef3a14a6 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Mon, 21 Dec 2020 23:20:03 -0800
Subject: [PATCH 2/6] Fix gmp hash and update the patch
---
ports/gmp/portfile.cmake | 6 ++--
ports/gmp/runtime.patch | 76 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
index 75a93d8298a348..702dfad3857645 100644
--- a/ports/gmp/portfile.cmake
+++ b/ports/gmp/portfile.cmake
@@ -85,12 +85,14 @@ else()
ARCHIVE
URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz
FILENAME gmp-6.2.1.tar.xz
- SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c)
+ SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
+ )
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
- REF gmp-6.2.1)
+ REF gmp-6.2.1
+ )
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/gmp/runtime.patch b/ports/gmp/runtime.patch
index 6e49dcd6a7407a..113f53bb737166 100644
--- a/ports/gmp/runtime.patch
+++ b/ports/gmp/runtime.patch
@@ -102,3 +102,79 @@ index fc70bd8..d515523 100644
true
+diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
+index cb5f090..19b2b8d 100644
+--- a/SMP/smp_winrt.props
++++ b/SMP/smp_winrt.props
+@@ -97,7 +97,7 @@
+
+
+
+- lib$(RootNamespace)d_winrt
++ l$(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -105,7 +105,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)d_winrt
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -113,7 +113,7 @@
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -121,7 +121,7 @@
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -129,7 +129,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -137,7 +137,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -145,7 +145,7 @@
+ MSB8012
+
+
+- $(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -153,7 +153,7 @@
+ MSB8012
+
+
+- $(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
From ed811f77c80a1f8943e8859a185d7185d61112f7 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 22 Dec 2020 23:40:26 -0800
Subject: [PATCH 3/6] [nettle] Update to latest revision
---
ports/nettle/CONTROL | 3 +-
ports/nettle/fix-InstallLibPath.patch | 72 +-
ports/nettle/gmp.patch | 478 ++++++-------
ports/nettle/name.dir.patch | 948 +++++++++++---------------
ports/nettle/portfile.cmake | 57 +-
ports/nettle/runtime.hogweed.patch | 84 ---
ports/nettle/runtime.nettle.patch | 84 ---
ports/nettle/runtime.patch | 168 +++++
8 files changed, 817 insertions(+), 1077 deletions(-)
delete mode 100644 ports/nettle/runtime.hogweed.patch
delete mode 100644 ports/nettle/runtime.nettle.patch
create mode 100644 ports/nettle/runtime.patch
diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL
index e8cffedd7d0b91..1fe47b5a21960b 100644
--- a/ports/nettle/CONTROL
+++ b/ports/nettle/CONTROL
@@ -1,6 +1,5 @@
Source: nettle
-Version: 3.5.1
-Port-Version: 5
+Version: 3.6
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), yasm-tool-helper (windows)
diff --git a/ports/nettle/fix-InstallLibPath.patch b/ports/nettle/fix-InstallLibPath.patch
index 363cda9ba2ef1b..de3b61acf99178 100644
--- a/ports/nettle/fix-InstallLibPath.patch
+++ b/ports/nettle/fix-InstallLibPath.patch
@@ -1,36 +1,36 @@
-diff --git a/configure.ac b/configure.ac
-index 3547cae..e13a5bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -366,25 +366,25 @@ if test "x$ABI" != xstandard ; then
- else
- # The dash builtin pwd tries to be "helpful" and remember
- # symlink names. Use -P option, and hope it's portable enough.
-- test -d /usr/lib${ABI} \
-- && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
-- && libdir='${exec_prefix}/'"lib${ABI}"
-+ test -d /usr/lib \
-+ && (cd /usr/lib && pwd -P | grep >/dev/null "/lib"'$') \
-+ && libdir='${exec_prefix}/'"lib"
- fi
- ;;
- # On freebsd, it seems 32-bit libraries are in lib32,
- # and 64-bit in lib. Don't know about "kfreebsd", does
- # it follow the Linux fhs conventions?
- *:freebsd*:32)
-- libdir='${exec_prefix}/lib32'
-+ libdir='${exec_prefix}/lib'
- ;;
- *:freebsd*:64)
- libdir='${exec_prefix}/lib'
- ;;
- *:irix*:32)
-- libdir='${exec_prefix}/lib32'
-+ libdir='${exec_prefix}/lib'
- ;;
- *:irix*:64)
-- libdir='${exec_prefix}/lib64'
-+ libdir='${exec_prefix}/lib'
- ;;
- *)
- AC_MSG_WARN([Don't know where to install $ABI-bit libraries on this system.]); dnl '
+diff --git a/configure.ac b/configure.ac
+index 90ea1ea..58cfe88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -354,25 +354,25 @@ if test "x$ABI" != xstandard ; then
+ else
+ # The dash builtin pwd tries to be "helpful" and remember
+ # symlink names. Use -P option, and hope it's portable enough.
+- test -d /usr/lib${ABI} \
+- && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
+- && libdir='${exec_prefix}/'"lib${ABI}"
++ test -d /usr/lib \
++ && (cd /usr/lib && pwd -P | grep >/dev/null "/lib"'$') \
++ && libdir='${exec_prefix}/'"lib"
+ fi
+ ;;
+ # On freebsd, it seems 32-bit libraries are in lib32,
+ # and 64-bit in lib. Don't know about "kfreebsd", does
+ # it follow the Linux fhs conventions?
+ *:freebsd*:32)
+- libdir='${exec_prefix}/lib32'
++ libdir='${exec_prefix}/lib'
+ ;;
+ *:freebsd*:64)
+ libdir='${exec_prefix}/lib'
+ ;;
+ *:irix*:32)
+- libdir='${exec_prefix}/lib32'
++ libdir='${exec_prefix}/lib'
+ ;;
+ *:irix*:64)
+- libdir='${exec_prefix}/lib64'
++ libdir='${exec_prefix}/lib'
+ ;;
+ *)
+ AC_MSG_WARN([Don't know where to install $ABI-bit libraries on this system.]); dnl '
diff --git a/ports/nettle/gmp.patch b/ports/nettle/gmp.patch
index b732e0360def8e..fcdd01c55708fb 100644
--- a/ports/nettle/gmp.patch
+++ b/ports/nettle/gmp.patch
@@ -1,273 +1,205 @@
-diff --git a/SMP/config.h b/SMP/config.h
-index 5e59a1daa..c5a658954 100644
---- a/SMP/config.h
-+++ b/SMP/config.h
-@@ -101,7 +101,7 @@
- #define HAVE_SYS_TYPES_H 1
-
- /* Define to 1 if you have the header file. */
--#define HAVE_UNISTD_H 1
-+//#define HAVE_UNISTD_H 1
-
- /* Define to 1 if you have the header file. */
- /* #undef HAVE_VALGRIND_MEMCHECK_H */
-diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj
-index cdf309639..9d37146a4 100644
---- a/SMP/libhogweed.vcxproj
-+++ b/SMP/libhogweed.vcxproj
-@@ -1325,7 +1325,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- true
- 5.1
-- nettled.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1457,7 +1457,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -1585,7 +1585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
- true
- 6.1
-- nettled.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1715,7 +1715,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -2368,7 +2368,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- true
- 5.1
-- nettle.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -2641,7 +2641,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -2915,7 +2915,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
- true
- 6.1
-- nettle.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -3186,7 +3186,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
-index 9ea0d8ea7..56583e10f 100644
---- a/SMP/libnettle.vcxproj
-+++ b/SMP/libnettle.vcxproj
-@@ -968,7 +968,7 @@
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libgmpd.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1091,7 +1091,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libgmpd_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1212,7 +1212,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libgmpd.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1335,7 +1335,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libgmpd_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1463,7 +1463,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 5.1
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- gmpd.lib;%(AdditionalDependencies)
-+ gmpd.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1595,7 +1595,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 8.1
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- gmpd_winrt.lib;%(AdditionalDependencies)
-+ gmpd.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1721,7 +1721,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 6.1
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- gmpd.lib;%(AdditionalDependencies)
-+ gmpd.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1851,7 +1851,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 8.1
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- gmpd_winrt.lib;%(AdditionalDependencies)
-+ gmpd.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1979,7 +1979,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libgmp.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -2108,7 +2108,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -2235,7 +2235,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libgmp.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -2364,7 +2364,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -2498,7 +2498,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 5.1
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- gmp.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -2632,7 +2632,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 5.1
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libgmp.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -2770,7 +2770,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 8.1
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- gmp_winrt.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -2908,7 +2908,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 8.1
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -3041,7 +3041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 6.1
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- gmp.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -3174,7 +3174,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 6.1
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libgmp.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -3311,7 +3311,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 8.1
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- gmp_winrt.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -3448,7 +3448,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 8.1
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
+diff --git a/SMP/config.h b/SMP/config.h
+index e4de0f1..ba41eb4 100644
+--- a/SMP/config.h
++++ b/SMP/config.h
+@@ -102,7 +102,7 @@
+ #define HAVE_SYS_TYPES_H 1
+
+ /* Define to 1 if you have the header file. */
+-#define HAVE_UNISTD_H 1
++//#define HAVE_UNISTD_H 1
+
+ /* Define to 1 if you have the header file. */
+ /* #undef HAVE_VALGRIND_MEMCHECK_H */
+diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
+index 476f7a7..308bd0b 100644
+--- a/SMP/libhogweed_winrt.vcxproj
++++ b/SMP/libhogweed_winrt.vcxproj
+@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
++ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
++ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
++ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
++ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
+index 088cb85..cc2cbeb 100644
+--- a/SMP/libnettle.vcxproj
++++ b/SMP/libnettle.vcxproj
+@@ -18,7 +18,7 @@
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj
+index cb650ab..188f67a 100644
+--- a/SMP/libnettle_winrt.vcxproj
++++ b/SMP/libnettle_winrt.vcxproj
+@@ -18,7 +18,7 @@
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmpd_winrt.lib;%(AdditionalDependencies)
++ gmpd.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmpd_winrt.lib;%(AdditionalDependencies)
++ gmpd.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
diff --git a/ports/nettle/name.dir.patch b/ports/nettle/name.dir.patch
index 753aaff5af7314..110ac097042912 100644
--- a/ports/nettle/name.dir.patch
+++ b/ports/nettle/name.dir.patch
@@ -1,567 +1,381 @@
-diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj
-index 9f741e240..5bb05b359 100644
---- a/SMP/libhogweed.vcxproj
-+++ b/SMP/libhogweed.vcxproj
-@@ -670,142 +670,142 @@
-
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweedd
-+ hogweedd
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweedd_winrt
-+ hogweedd
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweedd
-- $(ProjectDir)..\..\..\msvc\
-+ hogweedd
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweedd_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ hogweedd
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- hogweedd
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- hogweedd_winrt
-+ hogweedd
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- hogweedd
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- hogweedd_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ hogweedd
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweed
-+ hogweed
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweed_winrt
-+ hogweed
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweed
-- $(ProjectDir)..\..\..\msvc\
-+ hogweed
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libhogweed_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ hogweed
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- hogweed
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- hogweed
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- hogweed_winrt
-+ hogweed
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- hogweed_winrt
-+ hogweed
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- hogweed
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- hogweed
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- hogweed_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ hogweed
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- hogweed_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ hogweed
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-@@ -826,7 +826,7 @@
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libnettled.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -950,7 +950,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libnettled_winrt.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1072,7 +1072,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libnettled.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1196,7 +1196,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libnettled_winrt.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1325,7 +1325,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- true
- 5.1
-- nettled.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1457,7 +1457,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettled.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -1585,7 +1585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
- true
- 6.1
-- nettled.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1715,7 +1715,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettled.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -1845,7 +1845,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1975,7 +1975,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX86
- Windows
- $(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -2103,7 +2103,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -2233,7 +2233,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- MachineX64
- Windows
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -2368,7 +2368,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- true
- 5.1
-- nettle.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -2503,7 +2503,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- true
- 5.1
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -2641,7 +2641,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettle.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -2780,7 +2780,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x86\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -2915,7 +2915,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
- true
- 6.1
-- nettle.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -3049,7 +3049,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)
- true
- 6.1
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -3186,7 +3186,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- nettle.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-@@ -3324,7 +3324,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- true
- 10.0
- 8.1
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- $(OutDir)\lib\x64\$(RootNamespace).winmd
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
-index 56583e10f..665e8ef4e 100644
---- a/SMP/libnettle.vcxproj
-+++ b/SMP/libnettle.vcxproj
-@@ -812,142 +812,142 @@
-
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettled
-+ nettled
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettled_winrt
-+ nettled
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettled
-- $(ProjectDir)..\..\..\msvc\
-+ nettled
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettled_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ nettled
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- nettled
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- nettled_winrt
-+ nettled
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- nettled
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- nettled_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ nettled
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettle
-+ nettle
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettle_winrt
-+ nettle
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettle
-- $(ProjectDir)..\..\..\msvc\
-+ nettle
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- libnettle_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ nettle
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- nettle
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- nettle
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- nettle_winrt
-+ nettle
- Clean
- MSB8012
-
-
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- nettle_winrt
-+ nettle
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- nettle
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- nettle
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- nettle_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ nettle
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-
- $(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
-- nettle_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ nettle
-+ $(ProjectDir)..\msvc\
- Clean
- MSB8012
-
-diff --git a/hogweed.pc.in b/hogweed.pc.in
-index 97fb9d46a..ce977c02e 100644
---- a/hogweed.pc.in
-+++ b/hogweed.pc.in
-@@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle
- Version: @PACKAGE_VERSION@
- Requires: @IF_NOT_SHARED@ nettle
- Requires.private: @IF_SHARED@ nettle
--Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@
-+Libs: -L${libdir} @HOGWEED@ @IF_NOT_SHARED@ @LIBS@
- Libs.private: @IF_SHARED@ @LIBS@
- Cflags: -I${includedir}
-
-diff --git a/nettle.pc.in b/nettle.pc.in
-index eb0020caa..6e3ed1e4f 100644
---- a/nettle.pc.in
-+++ b/nettle.pc.in
-@@ -7,5 +7,6 @@ Name: Nettle
- Description: Nettle low-level cryptographic library (symmetric algorithms)
- URL: http://www.lysator.liu.se/~nisse/nettle
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lnettle
-+Requires.private: gmp
-+Libs: -L${libdir} @LIBS@
- Cflags: -I${includedir}
+diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj
+index 976d9fc..5fd42ba 100644
+--- a/SMP/libhogweed.vcxproj
++++ b/SMP/libhogweed.vcxproj
+@@ -18,7 +18,7 @@
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
+index 308bd0b..a436c69 100644
+--- a/SMP/libhogweed_winrt.vcxproj
++++ b/SMP/libhogweed_winrt.vcxproj
+@@ -18,7 +18,7 @@
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled_winrt.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled_winrt.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
++ nettled.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
++ nettled.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
++ nettle.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
++ nettle.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
+index 487099d..1eade47 100644
+--- a/SMP/smp_deps.props
++++ b/SMP/smp_deps.props
+@@ -104,16 +104,16 @@
+
+
+
+- lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -121,7 +121,7 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -129,23 +129,23 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -153,7 +153,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -161,7 +161,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -169,7 +169,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -177,7 +177,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
+index d44408a..b44482c 100644
+--- a/SMP/smp_winrt_deps.props
++++ b/SMP/smp_winrt_deps.props
+@@ -115,80 +115,80 @@
+
+
+
+- lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/hogweed.pc.in b/hogweed.pc.in
+index 97fb9d4..ce977c0 100644
+--- a/hogweed.pc.in
++++ b/hogweed.pc.in
+@@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle
+ Version: @PACKAGE_VERSION@
+ Requires: @IF_NOT_SHARED@ nettle
+ Requires.private: @IF_SHARED@ nettle
+-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@
++Libs: -L${libdir} @HOGWEED@ @IF_NOT_SHARED@ @LIBS@
+ Libs.private: @IF_SHARED@ @LIBS@
+ Cflags: -I${includedir}
+
+diff --git a/nettle.pc.in b/nettle.pc.in
+index eb0020c..6e3ed1e 100644
+--- a/nettle.pc.in
++++ b/nettle.pc.in
+@@ -7,5 +7,6 @@ Name: Nettle
+ Description: Nettle low-level cryptographic library (symmetric algorithms)
+ URL: http://www.lysator.liu.se/~nisse/nettle
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lnettle
++Requires.private: gmp
++Libs: -L${libdir} @LIBS@
+ Cflags: -I${includedir}
diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake
index 616d9af2888326..37c294381b0103 100644
--- a/ports/nettle/portfile.cmake
+++ b/ports/nettle/portfile.cmake
@@ -2,13 +2,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ShiftMediaProject/nettle
- REF 1d0a6e64e01458fdf37eaf5d90975deb52c3da41 #v3.5.1
- SHA512 6124fbd223e6519d88290c3f4e3b8cc399e038c9c77cfec38e6ab17b075846e662fd0360d62c132c882536489c8a865795f64059e2d2b21467f65d90320e5c39
+ REF bf483378326c67d634977287dd576279734b7acc #v3.6
+ SHA512 ba125a27c81a800be8bc8d1b0d4f3125587330ef64d8a605b4d3ae211fb675c5ef89e9bf4bcf63b07d0f004c6c5ff851630690cdd1eda6b5b8a526d84edffe73
HEAD_REF master
- PATCHES gmp.patch
- name.dir.patch
- runtime.nettle.patch
- runtime.hogweed.patch
+ PATCHES
+ gmp.patch
+ name.dir.patch
+ runtime.patch
)
include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)
@@ -29,40 +29,35 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
#Setup YASM integration
- set(_file "${SOURCE_PATH}/SMP/libnettle.vcxproj")
- file(READ "${_file}" _contents)
+ set(_nettleproject)
+ set(_hogweedproject)
+ if(VCPKG_TARGET_IS_UWP)
+ set(_nettleproject "${SOURCE_PATH}/SMP/libnettle_winrt.vcxproj")
+ set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed_winrt.vcxproj")
+ else()
+ set(_nettleproject "${SOURCE_PATH}/SMP/libnettle.vcxproj")
+ set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed.vcxproj")
+ endif()
+
+ file(READ "${_nettleproject}" _contents)
string(REPLACE [[]]
""
_contents "${_contents}")
string(REPLACE [[]]
""
_contents "${_contents}")
- string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet
- if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}")
- STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}")
- else()
- STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}")
- STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}")
- endif()
- file(WRITE "${_file}" "${_contents}")
- set(_file "${SOURCE_PATH}/SMP/libhogweed.vcxproj")
- file(READ "${_file}" _contents)
+ string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already
+ file(WRITE "${_nettleproject}" "${_contents}")
+
+ file(READ "${_hogweedproject}" _contents)
string(REPLACE [[]]
""
_contents "${_contents}")
string(REPLACE [[]]
""
_contents "${_contents}")
- string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet
- if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}")
- STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}")
- else()
- STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}")
- STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}")
- endif()
- file(WRITE "${_file}" "${_contents}")
+ string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already
+ file(WRITE "${_hogweedproject}" "${_contents}")
vcpkg_install_msbuild(
USE_VCPKG_INTEGRATION
@@ -104,9 +99,9 @@ else()
GITLAB_URL https://git.lysator.liu.se/
OUT_SOURCE_PATH SOURCE_PATH
REPO nettle/nettle
- REF ee5d62898cf070f08beedc410a8d7c418588bd95 #v3.5.1
- SHA512 881912548f4abb21460f44334de11439749c8a055830849a8beb4332071d11d9196d9eecaeba5bf822819d242356083fba91eb8719a64f90e41766826e6d75e1
- HEAD_REF master # branch name
+ REF 9e2bea82b9fb606bffd2d3f648e05248e146e54f #v3.6
+ SHA512 008089eba2ef197a0ec6a266baac485e72051e646d19861f3fb605915a591bc2dd38edcb4ea7eaad958ea5d56f7744d42c25b691b49921a1285edd22f9c90b7f
+ HEAD_REF master
PATCHES fix-InstallLibPath.patch
)
diff --git a/ports/nettle/runtime.hogweed.patch b/ports/nettle/runtime.hogweed.patch
deleted file mode 100644
index a096b77b7b6d19..00000000000000
--- a/ports/nettle/runtime.hogweed.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj
-index 3f400af81..e5758ea27 100644
---- a/SMP/libhogweed.vcxproj
-+++ b/SMP/libhogweed.vcxproj
-@@ -1066,6 +1066,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -1190,6 +1191,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -1574,6 +1576,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -1703,6 +1706,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -2097,6 +2101,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(OutDir)\lib\x64\$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -2227,6 +2232,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -2902,6 +2908,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDLL
-
-
- true
-@@ -3036,6 +3043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDLL
-
-
- true
-@@ -3172,6 +3180,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDLL
-
-
- true
-@@ -3310,6 +3319,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-+ MultiThreadedDLL
-
-
- true
diff --git a/ports/nettle/runtime.nettle.patch b/ports/nettle/runtime.nettle.patch
deleted file mode 100644
index 33d147ededee2e..00000000000000
--- a/ports/nettle/runtime.nettle.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
-index 54f686af6..05b903ab9 100644
---- a/SMP/libnettle.vcxproj
-+++ b/SMP/libnettle.vcxproj
-@@ -1206,6 +1206,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -1329,6 +1330,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -1710,6 +1712,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -1838,6 +1841,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -2229,6 +2233,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(OutDir)\lib\x64\$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -2358,6 +2363,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -3028,6 +3034,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreadedDLL
-
-
- true
-@@ -3161,6 +3168,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreaded
-
-
- true
-@@ -3296,6 +3304,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreadedDLL
-
-
- true
-@@ -3433,6 +3442,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- false
- 4113;%(TreatSpecificWarningsAsErrors)
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-+ MultiThreaded
-
-
- true
diff --git a/ports/nettle/runtime.patch b/ports/nettle/runtime.patch
new file mode 100644
index 00000000000000..6d5f2b192c0b0a
--- /dev/null
+++ b/ports/nettle/runtime.patch
@@ -0,0 +1,168 @@
+diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
+index 1eade47..ab279f4 100644
+--- a/SMP/smp_deps.props
++++ b/SMP/smp_deps.props
+@@ -193,6 +193,7 @@
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -211,6 +212,7 @@
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -230,6 +232,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
+@@ -253,6 +256,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
+@@ -282,6 +286,7 @@
+ SingleFile
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -307,6 +312,7 @@
+ SingleFile
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -331,6 +337,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -362,6 +369,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -392,6 +400,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -423,6 +432,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
+index b44482c..35ae231 100644
+--- a/SMP/smp_winrt_deps.props
++++ b/SMP/smp_winrt_deps.props
+@@ -206,6 +206,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -226,6 +227,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -247,6 +249,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
+@@ -274,6 +277,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
+@@ -307,6 +311,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -335,6 +340,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -361,6 +367,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -396,6 +403,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -430,6 +438,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -465,6 +474,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
From 0a2b88fb2f765e5c3ba23a0e1600048910ebbc22 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 23 Dec 2020 22:17:03 -0800
Subject: [PATCH 4/6] Update the version
---
ports/gmp/portfile.cmake | 3 +-
ports/gmp/runtime.patch | 360 ++++++------
ports/gmp/vs.build.patch | 344 ++++++------
ports/nettle/fix-InstallLibPath.patch | 72 +--
ports/nettle/gmp.patch | 410 +++++++-------
ports/nettle/name.dir.patch | 762 +++++++++++++-------------
ports/nettle/runtime.patch | 336 ++++++------
7 files changed, 1143 insertions(+), 1144 deletions(-)
diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
index 702dfad3857645..d78d4cc302809c 100644
--- a/ports/gmp/portfile.cmake
+++ b/ports/gmp/portfile.cmake
@@ -63,7 +63,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
)
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")
- set(PACKAGE_VERSION 6.2.0)
+ set(PACKAGE_VERSION 6.2.1)
set(PACKAGE_NAME gmp)
set(prefix "${CURRENT_INSTALLED_DIR}")
set(exec_prefix "\${prefix}")
@@ -97,7 +97,6 @@ else()
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
- OPTIONS ${OPTIONS}
)
vcpkg_install_make()
diff --git a/ports/gmp/runtime.patch b/ports/gmp/runtime.patch
index 113f53bb737166..f219e3dc740043 100644
--- a/ports/gmp/runtime.patch
+++ b/ports/gmp/runtime.patch
@@ -1,180 +1,180 @@
-diff --git a/SMP/smp.props b/SMP/smp.props
-index fc70bd8..d515523 100644
---- a/SMP/smp.props
-+++ b/SMP/smp.props
-@@ -86,7 +86,7 @@
-
-
-
-- lib$(RootNamespace)d
-+ $(RootNamespace)d
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -94,7 +94,7 @@
- MSB8012
-
-
-- lib$(RootNamespace)d
-+ $(RootNamespace)d
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -118,7 +118,7 @@
- MSB8012
-
-
-- lib$(RootNamespace)
-+ $(RootNamespace)
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -126,7 +126,7 @@
- MSB8012
-
-
-- lib$(RootNamespace)
-+ $(RootNamespace)
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -159,6 +159,7 @@
- $(OutDir)\lib\x86\$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
-@@ -177,6 +178,7 @@
- $(OutDir)\lib\x64\$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -196,6 +198,7 @@
- $(IntDir)$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
-@@ -219,6 +222,7 @@
- $(IntDir)$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -248,6 +252,7 @@
- SingleFile
- $(OutDir)\lib\x86\$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
-@@ -273,6 +278,7 @@
- SingleFile
- $(OutDir)\lib\x64\$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -297,6 +303,7 @@
- $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-@@ -328,6 +335,7 @@
- $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
-index cb5f090..19b2b8d 100644
---- a/SMP/smp_winrt.props
-+++ b/SMP/smp_winrt.props
-@@ -97,7 +97,7 @@
-
-
-
-- lib$(RootNamespace)d_winrt
-+ l$(RootNamespace)d
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -105,7 +105,7 @@
- MSB8012
-
-
-- lib$(RootNamespace)d_winrt
-+ $(RootNamespace)d
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -113,7 +113,7 @@
- MSB8012
-
-
-- $(RootNamespace)d_winrt
-+ $(RootNamespace)d
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -121,7 +121,7 @@
- MSB8012
-
-
-- $(RootNamespace)d_winrt
-+ $(RootNamespace)d
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -129,7 +129,7 @@
- MSB8012
-
-
-- lib$(RootNamespace)_winrt
-+ $(RootNamespace)
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -137,7 +137,7 @@
- MSB8012
-
-
-- lib$(RootNamespace)_winrt
-+ $(RootNamespace)
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -145,7 +145,7 @@
- MSB8012
-
-
-- $(RootNamespace)_winrt
-+ $(RootNamespace)
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
-@@ -153,7 +153,7 @@
- MSB8012
-
-
-- $(RootNamespace)_winrt
-+ $(RootNamespace)
- $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
+diff --git a/SMP/smp.props b/SMP/smp.props
+index fc70bd8..d515523 100644
+--- a/SMP/smp.props
++++ b/SMP/smp.props
+@@ -86,7 +86,7 @@
+
+
+
+- lib$(RootNamespace)d
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -94,7 +94,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)d
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -118,7 +118,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -126,7 +126,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -159,6 +159,7 @@
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -177,6 +178,7 @@
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -196,6 +198,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
+@@ -219,6 +222,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
+@@ -248,6 +252,7 @@
+ SingleFile
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -273,6 +278,7 @@
+ SingleFile
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -297,6 +303,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -328,6 +335,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
+index cb5f090..19b2b8d 100644
+--- a/SMP/smp_winrt.props
++++ b/SMP/smp_winrt.props
+@@ -97,7 +97,7 @@
+
+
+
+- lib$(RootNamespace)d_winrt
++ l$(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -105,7 +105,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)d_winrt
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -113,7 +113,7 @@
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -121,7 +121,7 @@
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
++ $(RootNamespace)d
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -129,7 +129,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -137,7 +137,7 @@
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -145,7 +145,7 @@
+ MSB8012
+
+
+- $(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+@@ -153,7 +153,7 @@
+ MSB8012
+
+
+- $(RootNamespace)_winrt
++ $(RootNamespace)
+ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
diff --git a/ports/gmp/vs.build.patch b/ports/gmp/vs.build.patch
index 2d5e869a0e74ff..4c04d0c1659645 100644
--- a/ports/gmp/vs.build.patch
+++ b/ports/gmp/vs.build.patch
@@ -1,172 +1,172 @@
-diff --git a/SMP/smp.props b/SMP/smp.props
-index e2ed214..fc70bd8 100644
---- a/SMP/smp.props
-+++ b/SMP/smp.props
-@@ -87,7 +87,7 @@
-
-
- lib$(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -95,7 +95,7 @@
-
-
- lib$(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -103,7 +103,7 @@
-
-
- $(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -111,7 +111,7 @@
-
-
- $(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -119,7 +119,7 @@
-
-
- lib$(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -127,7 +127,7 @@
-
-
- lib$(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -135,7 +135,7 @@
-
-
- $(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -143,7 +143,7 @@
-
-
- $(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
-index 9b453a5..cb5f090 100644
---- a/SMP/smp_winrt.props
-+++ b/SMP/smp_winrt.props
-@@ -98,7 +98,7 @@
-
-
- lib$(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -106,7 +106,7 @@
-
-
- lib$(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -114,7 +114,7 @@
-
-
- $(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -122,7 +122,7 @@
-
-
- $(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -130,7 +130,7 @@
-
-
- lib$(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -138,7 +138,7 @@
-
-
- lib$(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -146,7 +146,7 @@
-
-
- $(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -154,7 +154,7 @@
-
-
- $(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-diff --git a/gmp.pc.in b/gmp.pc.in
-index bf1c799..d0c81be 100644
---- a/gmp.pc.in
-+++ b/gmp.pc.in
-@@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library
- URL: https://gmplib.org
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lgmp
-+Libs: -L${libdir} @LIBS@
-diff --git a/gmpxx.pc.in b/gmpxx.pc.in
-index 181cc70..2b697ce 100644
---- a/gmpxx.pc.in
-+++ b/gmpxx.pc.in
-@@ -9,4 +9,4 @@ URL: https://gmplib.org
- Version: @PACKAGE_VERSION@
- Requires: gmp
- Cflags: -I${includedir}
--Libs: -L${libdir} -lgmpxx
-+Libs: -L${libdir} @LIBS@
+diff --git a/SMP/smp.props b/SMP/smp.props
+index e2ed214..fc70bd8 100644
+--- a/SMP/smp.props
++++ b/SMP/smp.props
+@@ -87,7 +87,7 @@
+
+
+ lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -95,7 +95,7 @@
+
+
+ lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -103,7 +103,7 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -111,7 +111,7 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -119,7 +119,7 @@
+
+
+ lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -127,7 +127,7 @@
+
+
+ lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -135,7 +135,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -143,7 +143,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
+index 9b453a5..cb5f090 100644
+--- a/SMP/smp_winrt.props
++++ b/SMP/smp_winrt.props
+@@ -98,7 +98,7 @@
+
+
+ lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -106,7 +106,7 @@
+
+
+ lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -114,7 +114,7 @@
+
+
+ $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -122,7 +122,7 @@
+
+
+ $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -130,7 +130,7 @@
+
+
+ lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -138,7 +138,7 @@
+
+
+ lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -146,7 +146,7 @@
+
+
+ $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -154,7 +154,7 @@
+
+
+ $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/gmp.pc.in b/gmp.pc.in
+index bf1c799..d0c81be 100644
+--- a/gmp.pc.in
++++ b/gmp.pc.in
+@@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library
+ URL: https://gmplib.org
+ Version: @PACKAGE_VERSION@
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lgmp
++Libs: -L${libdir} @LIBS@
+diff --git a/gmpxx.pc.in b/gmpxx.pc.in
+index 181cc70..2b697ce 100644
+--- a/gmpxx.pc.in
++++ b/gmpxx.pc.in
+@@ -9,4 +9,4 @@ URL: https://gmplib.org
+ Version: @PACKAGE_VERSION@
+ Requires: gmp
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lgmpxx
++Libs: -L${libdir} @LIBS@
diff --git a/ports/nettle/fix-InstallLibPath.patch b/ports/nettle/fix-InstallLibPath.patch
index de3b61acf99178..d42a280679d4b2 100644
--- a/ports/nettle/fix-InstallLibPath.patch
+++ b/ports/nettle/fix-InstallLibPath.patch
@@ -1,36 +1,36 @@
-diff --git a/configure.ac b/configure.ac
-index 90ea1ea..58cfe88 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -354,25 +354,25 @@ if test "x$ABI" != xstandard ; then
- else
- # The dash builtin pwd tries to be "helpful" and remember
- # symlink names. Use -P option, and hope it's portable enough.
-- test -d /usr/lib${ABI} \
-- && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
-- && libdir='${exec_prefix}/'"lib${ABI}"
-+ test -d /usr/lib \
-+ && (cd /usr/lib && pwd -P | grep >/dev/null "/lib"'$') \
-+ && libdir='${exec_prefix}/'"lib"
- fi
- ;;
- # On freebsd, it seems 32-bit libraries are in lib32,
- # and 64-bit in lib. Don't know about "kfreebsd", does
- # it follow the Linux fhs conventions?
- *:freebsd*:32)
-- libdir='${exec_prefix}/lib32'
-+ libdir='${exec_prefix}/lib'
- ;;
- *:freebsd*:64)
- libdir='${exec_prefix}/lib'
- ;;
- *:irix*:32)
-- libdir='${exec_prefix}/lib32'
-+ libdir='${exec_prefix}/lib'
- ;;
- *:irix*:64)
-- libdir='${exec_prefix}/lib64'
-+ libdir='${exec_prefix}/lib'
- ;;
- *)
- AC_MSG_WARN([Don't know where to install $ABI-bit libraries on this system.]); dnl '
+diff --git a/configure.ac b/configure.ac
+index 90ea1ea..58cfe88 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -354,25 +354,25 @@ if test "x$ABI" != xstandard ; then
+ else
+ # The dash builtin pwd tries to be "helpful" and remember
+ # symlink names. Use -P option, and hope it's portable enough.
+- test -d /usr/lib${ABI} \
+- && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
+- && libdir='${exec_prefix}/'"lib${ABI}"
++ test -d /usr/lib \
++ && (cd /usr/lib && pwd -P | grep >/dev/null "/lib"'$') \
++ && libdir='${exec_prefix}/'"lib"
+ fi
+ ;;
+ # On freebsd, it seems 32-bit libraries are in lib32,
+ # and 64-bit in lib. Don't know about "kfreebsd", does
+ # it follow the Linux fhs conventions?
+ *:freebsd*:32)
+- libdir='${exec_prefix}/lib32'
++ libdir='${exec_prefix}/lib'
+ ;;
+ *:freebsd*:64)
+ libdir='${exec_prefix}/lib'
+ ;;
+ *:irix*:32)
+- libdir='${exec_prefix}/lib32'
++ libdir='${exec_prefix}/lib'
+ ;;
+ *:irix*:64)
+- libdir='${exec_prefix}/lib64'
++ libdir='${exec_prefix}/lib'
+ ;;
+ *)
+ AC_MSG_WARN([Don't know where to install $ABI-bit libraries on this system.]); dnl '
diff --git a/ports/nettle/gmp.patch b/ports/nettle/gmp.patch
index fcdd01c55708fb..c54298a28c5288 100644
--- a/ports/nettle/gmp.patch
+++ b/ports/nettle/gmp.patch
@@ -1,205 +1,205 @@
-diff --git a/SMP/config.h b/SMP/config.h
-index e4de0f1..ba41eb4 100644
---- a/SMP/config.h
-+++ b/SMP/config.h
-@@ -102,7 +102,7 @@
- #define HAVE_SYS_TYPES_H 1
-
- /* Define to 1 if you have the header file. */
--#define HAVE_UNISTD_H 1
-+//#define HAVE_UNISTD_H 1
-
- /* Define to 1 if you have the header file. */
- /* #undef HAVE_VALGRIND_MEMCHECK_H */
-diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
-index 476f7a7..308bd0b 100644
---- a/SMP/libhogweed_winrt.vcxproj
-+++ b/SMP/libhogweed_winrt.vcxproj
-@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
-+ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
-+ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
-+ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
-+ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
-index 088cb85..cc2cbeb 100644
---- a/SMP/libnettle.vcxproj
-+++ b/SMP/libnettle.vcxproj
-@@ -18,7 +18,7 @@
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmpd.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmpd.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmp.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmp.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- libgmp.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- libgmp.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj
-index cb650ab..188f67a 100644
---- a/SMP/libnettle_winrt.vcxproj
-+++ b/SMP/libnettle_winrt.vcxproj
-@@ -18,7 +18,7 @@
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmpd_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmpd_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- gmpd_winrt.lib;%(AdditionalDependencies)
-+ gmpd.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- gmpd_winrt.lib;%(AdditionalDependencies)
-+ gmpd.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4244;4146;4267;4098;%(DisableSpecificWarnings)
-
-
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ %(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- gmp_winrt.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- gmp_winrt.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
-@@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libnettle.def
-- libgmp_winrt.lib;%(AdditionalDependencies)
-+ gmp.lib;%(AdditionalDependencies)
-
-
- mkdir "$(OutDir)"\include
+diff --git a/SMP/config.h b/SMP/config.h
+index e4de0f1..ba41eb4 100644
+--- a/SMP/config.h
++++ b/SMP/config.h
+@@ -102,7 +102,7 @@
+ #define HAVE_SYS_TYPES_H 1
+
+ /* Define to 1 if you have the header file. */
+-#define HAVE_UNISTD_H 1
++//#define HAVE_UNISTD_H 1
+
+ /* Define to 1 if you have the header file. */
+ /* #undef HAVE_VALGRIND_MEMCHECK_H */
+diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
+index 476f7a7..308bd0b 100644
+--- a/SMP/libhogweed_winrt.vcxproj
++++ b/SMP/libhogweed_winrt.vcxproj
+@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
++ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies)
++ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
++ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies)
++ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
+index 088cb85..cc2cbeb 100644
+--- a/SMP/libnettle.vcxproj
++++ b/SMP/libnettle.vcxproj
+@@ -18,7 +18,7 @@
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj
+index cb650ab..188f67a 100644
+--- a/SMP/libnettle_winrt.vcxproj
++++ b/SMP/libnettle_winrt.vcxproj
+@@ -18,7 +18,7 @@
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmpd_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmpd_winrt.lib;%(AdditionalDependencies)
++ gmpd.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmpd_winrt.lib;%(AdditionalDependencies)
++ gmpd.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4244;4146;4267;4098;%(DisableSpecificWarnings)
+
+
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ %(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- gmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
+@@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libnettle.def
+- libgmp_winrt.lib;%(AdditionalDependencies)
++ gmp.lib;%(AdditionalDependencies)
+
+
+ mkdir "$(OutDir)"\include
diff --git a/ports/nettle/name.dir.patch b/ports/nettle/name.dir.patch
index 110ac097042912..834a0440978740 100644
--- a/ports/nettle/name.dir.patch
+++ b/ports/nettle/name.dir.patch
@@ -1,381 +1,381 @@
-diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj
-index 976d9fc..5fd42ba 100644
---- a/SMP/libhogweed.vcxproj
-+++ b/SMP/libhogweed.vcxproj
-@@ -18,7 +18,7 @@
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettled.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettled.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- libnettle.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
-index 308bd0b..a436c69 100644
---- a/SMP/libhogweed_winrt.vcxproj
-+++ b/SMP/libhogweed_winrt.vcxproj
-@@ -18,7 +18,7 @@
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettled_winrt.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettled_winrt.lib;%(AdditionalDependencies)
-+ nettled.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
-+ nettled.lib;gmpd.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
- 4146;4267;4028;4244;%(DisableSpecificWarnings)
-
-
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
-+ nettle.lib;gmp.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
-
-
- libhogweed.def
-- libnettle_winrt.lib;%(AdditionalDependencies)
-+ nettle.lib;%(AdditionalDependencies)
- /IGNORE:4006,4221,4078 %(AdditionalOptions)
-
-
-diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
-index 487099d..1eade47 100644
---- a/SMP/smp_deps.props
-+++ b/SMP/smp_deps.props
-@@ -104,16 +104,16 @@
-
-
-
-- lib$(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)d
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- lib$(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)d
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -121,7 +121,7 @@
-
-
- $(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -129,23 +129,23 @@
-
-
- $(RootNamespace)d
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- lib$(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- lib$(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -153,7 +153,7 @@
-
-
- $(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -161,7 +161,7 @@
-
-
- $(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -169,7 +169,7 @@
-
-
- $(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-@@ -177,7 +177,7 @@
-
-
- $(RootNamespace)
-- $(ProjectDir)..\..\..\msvc\
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
-index d44408a..b44482c 100644
---- a/SMP/smp_winrt_deps.props
-+++ b/SMP/smp_winrt_deps.props
-@@ -115,80 +115,80 @@
-
-
-
-- lib$(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)d
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- lib$(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)d
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- $(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)d
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- $(RootNamespace)d_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)d
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- lib$(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- lib$(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- $(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- $(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- $(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
- MSB8012
-
-
-- $(RootNamespace)_winrt
-- $(ProjectDir)..\..\..\msvc\
-+ $(RootNamespace)
-+ $(ProjectDir)..\msvc\
- $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
- $(ProjectDir)obj\Generated
- Clean
-diff --git a/hogweed.pc.in b/hogweed.pc.in
-index 97fb9d4..ce977c0 100644
---- a/hogweed.pc.in
-+++ b/hogweed.pc.in
-@@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle
- Version: @PACKAGE_VERSION@
- Requires: @IF_NOT_SHARED@ nettle
- Requires.private: @IF_SHARED@ nettle
--Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@
-+Libs: -L${libdir} @HOGWEED@ @IF_NOT_SHARED@ @LIBS@
- Libs.private: @IF_SHARED@ @LIBS@
- Cflags: -I${includedir}
-
-diff --git a/nettle.pc.in b/nettle.pc.in
-index eb0020c..6e3ed1e 100644
---- a/nettle.pc.in
-+++ b/nettle.pc.in
-@@ -7,5 +7,6 @@ Name: Nettle
- Description: Nettle low-level cryptographic library (symmetric algorithms)
- URL: http://www.lysator.liu.se/~nisse/nettle
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lnettle
-+Requires.private: gmp
-+Libs: -L${libdir} @LIBS@
- Cflags: -I${includedir}
+diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj
+index 976d9fc..5fd42ba 100644
+--- a/SMP/libhogweed.vcxproj
++++ b/SMP/libhogweed.vcxproj
+@@ -18,7 +18,7 @@
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj
+index 308bd0b..a436c69 100644
+--- a/SMP/libhogweed_winrt.vcxproj
++++ b/SMP/libhogweed_winrt.vcxproj
+@@ -18,7 +18,7 @@
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled_winrt.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettled_winrt.lib;%(AdditionalDependencies)
++ nettled.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
++ nettled.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies)
++ nettled.lib;gmpd.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+ 4146;4267;4028;4244;%(DisableSpecificWarnings)
+
+
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
++ nettle.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies)
++ nettle.lib;gmp.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
+
+
+ libhogweed.def
+- libnettle_winrt.lib;%(AdditionalDependencies)
++ nettle.lib;%(AdditionalDependencies)
+ /IGNORE:4006,4221,4078 %(AdditionalOptions)
+
+
+diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
+index 487099d..1eade47 100644
+--- a/SMP/smp_deps.props
++++ b/SMP/smp_deps.props
+@@ -104,16 +104,16 @@
+
+
+
+- lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -121,7 +121,7 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -129,23 +129,23 @@
+
+
+ $(RootNamespace)d
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -153,7 +153,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -161,7 +161,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -169,7 +169,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+@@ -177,7 +177,7 @@
+
+
+ $(RootNamespace)
+- $(ProjectDir)..\..\..\msvc\
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
+index d44408a..b44482c 100644
+--- a/SMP/smp_winrt_deps.props
++++ b/SMP/smp_winrt_deps.props
+@@ -115,80 +115,80 @@
+
+
+
+- lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)d_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)d
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- lib$(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+ MSB8012
+
+
+- $(RootNamespace)_winrt
+- $(ProjectDir)..\..\..\msvc\
++ $(RootNamespace)
++ $(ProjectDir)..\msvc\
+ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\
+ $(ProjectDir)obj\Generated
+ Clean
+diff --git a/hogweed.pc.in b/hogweed.pc.in
+index 97fb9d4..ce977c0 100644
+--- a/hogweed.pc.in
++++ b/hogweed.pc.in
+@@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle
+ Version: @PACKAGE_VERSION@
+ Requires: @IF_NOT_SHARED@ nettle
+ Requires.private: @IF_SHARED@ nettle
+-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@
++Libs: -L${libdir} @HOGWEED@ @IF_NOT_SHARED@ @LIBS@
+ Libs.private: @IF_SHARED@ @LIBS@
+ Cflags: -I${includedir}
+
+diff --git a/nettle.pc.in b/nettle.pc.in
+index eb0020c..6e3ed1e 100644
+--- a/nettle.pc.in
++++ b/nettle.pc.in
+@@ -7,5 +7,6 @@ Name: Nettle
+ Description: Nettle low-level cryptographic library (symmetric algorithms)
+ URL: http://www.lysator.liu.se/~nisse/nettle
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lnettle
++Requires.private: gmp
++Libs: -L${libdir} @LIBS@
+ Cflags: -I${includedir}
diff --git a/ports/nettle/runtime.patch b/ports/nettle/runtime.patch
index 6d5f2b192c0b0a..3c232d882a7e06 100644
--- a/ports/nettle/runtime.patch
+++ b/ports/nettle/runtime.patch
@@ -1,168 +1,168 @@
-diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
-index 1eade47..ab279f4 100644
---- a/SMP/smp_deps.props
-+++ b/SMP/smp_deps.props
-@@ -193,6 +193,7 @@
- $(OutDir)\lib\x86\$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
-@@ -211,6 +212,7 @@
- $(OutDir)\lib\x64\$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -230,6 +232,7 @@
- $(IntDir)$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
-@@ -253,6 +256,7 @@
- $(IntDir)$(TargetName).pdb
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -282,6 +286,7 @@
- SingleFile
- $(OutDir)\lib\x86\$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
-@@ -307,6 +312,7 @@
- SingleFile
- $(OutDir)\lib\x64\$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -331,6 +337,7 @@
- $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-@@ -362,6 +369,7 @@
- $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-@@ -392,6 +400,7 @@
- $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-@@ -423,6 +432,7 @@
- $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
- $(IntDir)$(TargetName).pdb
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
-index b44482c..35ae231 100644
---- a/SMP/smp_winrt_deps.props
-+++ b/SMP/smp_winrt_deps.props
-@@ -206,6 +206,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
-@@ -226,6 +227,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebug
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -247,6 +249,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
-@@ -274,6 +277,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDebugDLL
-
-
- $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
-@@ -307,6 +311,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
-@@ -335,6 +340,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreaded
-
-
- $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
-@@ -361,6 +367,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-@@ -396,6 +403,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-@@ -430,6 +438,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
-@@ -465,6 +474,7 @@
- NotUsing
- false
- 4113;%(TreatSpecificWarningsAsErrors)
-+ MultiThreadedDLL
-
-
- true
+diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
+index 1eade47..ab279f4 100644
+--- a/SMP/smp_deps.props
++++ b/SMP/smp_deps.props
+@@ -193,6 +193,7 @@
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -211,6 +212,7 @@
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -230,6 +232,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
+@@ -253,6 +256,7 @@
+ $(IntDir)$(TargetName).pdb
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
+@@ -282,6 +286,7 @@
+ SingleFile
+ $(OutDir)\lib\x86\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -307,6 +312,7 @@
+ SingleFile
+ $(OutDir)\lib\x64\$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -331,6 +337,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -362,6 +369,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -392,6 +400,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -423,6 +432,7 @@
+ $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)
+ $(IntDir)$(TargetName).pdb
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
+index b44482c..35ae231 100644
+--- a/SMP/smp_winrt_deps.props
++++ b/SMP/smp_winrt_deps.props
+@@ -206,6 +206,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -226,6 +227,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebug
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -247,6 +249,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x86\$(TargetName)$(TargetExt)
+@@ -274,6 +277,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDebugDLL
+
+
+ $(OutDir)\bin\x64\$(TargetName)$(TargetExt)
+@@ -307,6 +311,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x86\$(TargetName)$(TargetExt)
+@@ -335,6 +340,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreaded
+
+
+ $(OutDir)\lib\x64\$(TargetName)$(TargetExt)
+@@ -361,6 +367,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -396,6 +403,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -430,6 +438,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
+@@ -465,6 +474,7 @@
+ NotUsing
+ false
+ 4113;%(TreatSpecificWarningsAsErrors)
++ MultiThreadedDLL
+
+
+ true
From 1f120ba19901141cbf7b2c30ba81b26bd90264d5 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 23 Dec 2020 22:18:44 -0800
Subject: [PATCH 5/6] Update package version
---
ports/nettle/portfile.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake
index 37c294381b0103..2f7503eb5246da 100644
--- a/ports/nettle/portfile.cmake
+++ b/ports/nettle/portfile.cmake
@@ -74,7 +74,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
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")
- set(PACKAGE_VERSION 3.5.1)
+ set(PACKAGE_VERSION 3.6)
set(prefix "${CURRENT_INSTALLED_DIR}")
set(exec_prefix "\${prefix}")
set(libdir "\${prefix}/lib")
From db0ff22b920e6e7e837a3012a5af9bc5e88ee3c1 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Mon, 28 Dec 2020 00:27:10 -0800
Subject: [PATCH 6/6] Update supports
---
ports/gmp/vcpkg.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
index f0cbfc61a5cb40..19f916179d0419 100644
--- a/ports/gmp/vcpkg.json
+++ b/ports/gmp/vcpkg.json
@@ -3,7 +3,7 @@
"version-string": "6.2.1-2",
"description": "The GNU Multiple Precision Arithmetic Library",
"homepage": "https://gmplib.org",
- "supports": "!(arm | arm64)",
+ "supports": "windows & !(arm | arm64)",
"dependencies": [
{
"name": "vs-yasm",