Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gmp,nettle,hogweed] Add new ports #10613

Merged
merged 36 commits into from
May 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
df57a82
add new function vcpkg_fixup_pkgconfig
Neumann-A Jan 31, 2020
8c89d6e
make message with changed files a debug_message
Neumann-A Jan 31, 2020
fd3d35d
add two more cases to the debug *.pc files
Neumann-A Feb 4, 2020
1b1d944
comment out prefix.
Neumann-A Feb 5, 2020
d7e2962
changed the comment header.
Neumann-A Feb 7, 2020
f4bfe74
add missing word
Neumann-A Feb 7, 2020
982c921
Merge branch 'master' into add_vcpkg_fixup_pkgconfig
Neumann-A Mar 12, 2020
3e0dd50
finish vcpkg_fixup_pkgconfig.cmake
Neumann-A Mar 12, 2020
a3d4a0b
Update vcpkg_fixup_pkgconfig.cmake
Neumann-A Mar 20, 2020
efbf912
transfer changes from x windows pr
Neumann-A Mar 25, 2020
a7c6c6c
fix typo in regex
Neumann-A Mar 26, 2020
9307095
add port for vs yasm integration within VCPKG
Neumann-A Mar 30, 2020
2a217d6
add gmp
Neumann-A Mar 30, 2020
417dd8a
add nettle
Neumann-A Mar 30, 2020
42bb403
Merge remote-tracking branch 'origin/add_vcpkg_fixup_pkgconfig' into …
Neumann-A Mar 30, 2020
5588d48
add missing windows flag in control
Neumann-A Mar 31, 2020
193fbca
CI workaround
Neumann-A Mar 31, 2020
6885beb
overwrite correct import.
Neumann-A Mar 31, 2020
181af65
If CI does not give logs just display some extra info
Neumann-A Mar 31, 2020
7866712
target replacement was mising
Neumann-A Mar 31, 2020
f9a8227
apply same replacements for nettle
Neumann-A Mar 31, 2020
76fbdcb
remove unnecessary status message
Neumann-A Mar 31, 2020
51e7188
remove unnecessary platform code
Neumann-A Mar 31, 2020
13ea5b8
update supports field for vs-yasm
Neumann-A Mar 31, 2020
af66ddd
apply replacement also to libhogweed
Neumann-A Mar 31, 2020
6bae44d
fix static builds
Neumann-A Mar 31, 2020
e844512
remove not working code
Neumann-A Mar 31, 2020
5d3a895
remove debug/release options
Neumann-A Mar 31, 2020
c548273
add additional replacement for the case the SOURCE dir has already be…
Neumann-A Apr 2, 2020
2501660
add triplet selection to vcpkg_install_msbuild
Neumann-A Apr 2, 2020
8692b57
fix missing ; in patches
Neumann-A Apr 2, 2020
36d5c0e
remove gmp dependency in static builds since they are not required
Neumann-A Apr 2, 2020
3ba8f9f
cleanup portfiles
Neumann-A Apr 3, 2020
efb0a62
Merge remote-tracking branch 'upstream/master' into add_gmp_nettle
Neumann-A Apr 29, 2020
54d0c92
add missing vcpkg_fixup_pkgconfig() call
Neumann-A Apr 29, 2020
0c68692
Merge remote-tracking branch 'upstream/master' into add_gmp_nettle
Neumann-A May 5, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ports/gmp/CONTROL
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Source: gmp
Version: 6.2.0
Homepage: https://gmplib.org/
Description: The GNU Multiple Precision Arithmetic Library
Build-Depends: vs-yasm (windows)
107 changes: 107 additions & 0 deletions ports/gmp/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ShiftMediaProject/gmp
REF e140dfc8668e96d7e56cbd46467945adcc6b3cc4 #v6.2.0
SHA512 3b646c142447946bb4556db01214ff130da917bc149946b8cf086f3b01e1cc3d664b941a30a42608799c14461b2f29e4b894b72915d723bd736513c8914729b7
HEAD_REF master
PATCHES vs.build.patch
runtime.patch
prefix.patch
)
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_DIR "${YASM}" DIRECTORY)
vcpkg_add_to_path(${YASM_DIR})
set(ENV{YASMPATH} ${YASM_DIR}/)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(CONFIGURATION_RELEASE ReleaseDLL)
set(CONFIGURATION_DEBUG DebugDLL)
else()
set(CONFIGURATION_RELEASE Release)
set(CONFIGURATION_DEBUG Debug)
endif()

if(VCPKG_TARGET_IS_UWP)
string(APPEND CONFIGURATION_RELEASE WinRT)
string(APPEND CONFIGURATION_DEBUG WinRT)
endif()

#Setup YASM integration
set(_file "${SOURCE_PATH}/SMP/libgmp.vcxproj")
file(READ "${_file}" _contents)
string(REPLACE [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />]]
"<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.props\" />"
_contents "${_contents}")
string(REPLACE [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />]]
"<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.targets\" />"
_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(
USE_VCPKG_INTEGRATION
SOURCE_PATH ${SOURCE_PATH}
PROJECT_SUBPATH SMP/libgmp.sln
PLATFORM ${TRIPLET_SYSTEM_ARCH}
LICENSE_SUBPATH COPYING.LESSERv3
TARGET Rebuild
RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE}
DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG}
SKIP_CLEAN
)
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_NAME gmp)
set(prefix "${CURRENT_INSTALLED_DIR}")
set(exec_prefix "\${prefix}")
set(libdir "\${prefix}/lib")
set(includedir "\${prefix}/include")
set(LIBS -lgmp)
configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmp.pc" @ONLY)
configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmpxx.pc" @ONLY)
set(prefix "${CURRENT_INSTALLED_DIR}/debug")
set(exec_prefix "\${prefix}")
set(libdir "\${prefix}/lib")
set(includedir "\${prefix}/../include")
set(LIBS -lgmpd)
configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmp.pc" @ONLY)
configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmpxx.pc" @ONLY)
vcpkg_fixup_pkgconfig()
else()
vcpkg_download_distfile(
ARCHIVE
URLS https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz
FILENAME gmp-6.2.0.tar.xz
SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF gmp-6.2.0
)

vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
OPTIONS ${OPTIONS}
)

vcpkg_install_make()
vcpkg_fixup_pkgconfig()
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()


38 changes: 38 additions & 0 deletions ports/gmp/prefix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
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 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd</TargetName>
+ <TargetName>gmpd</TargetName>
<OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd</TargetName>
+ <TargetName>gmpd</TargetName>
<OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
@@ -1630,14 +1630,14 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp</TargetName>
+ <TargetName>gmp</TargetName>
<OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp</TargetName>
+ <TargetName>gmp</TargetName>
<OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
68 changes: 68 additions & 0 deletions ports/gmp/runtime.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
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
<MinimalRebuild>false</MinimalRebuild>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -1929,6 +1930,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<SDLCheck>false</SDLCheck>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -2190,6 +2192,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
<MinimalRebuild>false</MinimalRebuild>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -2278,6 +2281,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<SDLCheck>false</SDLCheck>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -2549,6 +2553,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
<ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -2638,6 +2643,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<SDLCheck>false</SDLCheck>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -2916,6 +2922,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -3011,6 +3018,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<SDLCheck>false</SDLCheck>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
165 changes: 165 additions & 0 deletions ports/gmp/vs.build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
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 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd</TargetName>
+ <TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd_winrt</TargetName>
+ <TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>libgmpd</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>libgmpd</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmpd_winrt</TargetName>
+ <TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmpd</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmpd_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>gmpd</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp</TargetName>
+ <TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp_winrt</TargetName>
+ <TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>libgmp</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>libgmp</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmp_winrt</TargetName>
+ <TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmp</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmp_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>gmp</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
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@
5 changes: 5 additions & 0 deletions ports/nettle/CONTROL
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Source: nettle
Version: 3.5.1
Homepage: https://git.lysator.liu.se/nettle/nettle
Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
Build-Depends: gmp, vs-yasm (windows)
Loading