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.

Sign up for GitHub

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] try fixing build issues #11565

Merged
merged 2 commits into from
May 27, 2020
Merged

[gmp/nettle] try fixing build issues #11565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84f4d96
[gmp/nettle] try fixing build issues
Neumann-A May 25, 2020
8c67f99
[nettle/gmp] remove unnecessary comments
Neumann-A May 26, 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
2 changes: 1 addition & 1 deletion ports/gmp/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: gmp
Version: 6.2.0
Version: 6.2.0-1
Homepage: https://gmplib.org/
Description: The GNU Multiple Precision Arithmetic Library
Build-Depends: vs-yasm (windows)
4 changes: 2 additions & 2 deletions ports/gmp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
)
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_DIR "${YASM}" DIRECTORY)
vcpkg_add_to_path(${YASM_DIR})
set(ENV{YASMPATH} ${YASM_DIR}/)
vcpkg_add_to_path("${YASM_DIR}")

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(CONFIGURATION_RELEASE ReleaseDLL)
Expand Down Expand Up @@ -56,6 +55,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE}
DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG}
SKIP_CLEAN
OPTIONS /p:UseEnv=True
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
)
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")
Expand Down
2 changes: 1 addition & 1 deletion ports/nettle/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: nettle
Version: 3.5.1
Version: 3.5.1-1
Homepage: https://git.lysator.liu.se/nettle/nettle
Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.
Build-Depends: gmp, vs-yasm (windows)
4 changes: 2 additions & 2 deletions ports/nettle/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
)
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_DIR "${YASM}" DIRECTORY)
vcpkg_add_to_path(${YASM_DIR})
set(ENV{YASMPATH} ${YASM_DIR}/)
vcpkg_add_to_path("${YASM_DIR}")

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(CONFIGURATION_RELEASE ReleaseDLL)
Expand Down Expand Up @@ -74,6 +73,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE}
DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG}
SKIP_CLEAN
OPTIONS /p:UseEnv=True
)

get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)
Expand Down