[gmp] No asm for mingw-dynamic (#29782)

This commit is contained in:
Kai Pastor 2023-02-23 21:46:13 +01:00 committed by GitHub
parent b24cd526fc
commit ec96844b8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions

View File

@ -62,6 +62,9 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC")
vcpkg_find_acquire_program(CLANG)
set(ccas "${CLANG}")
endif()
elseif(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
# not exporting asm functions
set(disable_assembly ON)
else()
set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
endif()
@ -72,8 +75,8 @@ elseif(ccas)
cmake_path(GET ccas PARENT_PATH ccas_dir)
vcpkg_add_to_path("${ccas_dir}")
cmake_path(GET ccas FILENAME ccas_command)
vcpkg_list(APPEND OPTIONS "CCAS=${ccas_command}" "ASMFLAGS=${asmflags}")
endif()
vcpkg_list(APPEND OPTIONS "CCAS=${ccas_command}" "ASMFLAGS=${asmflags}")
if(VCPKG_CROSSCOMPILING)
set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")

View File

@ -1,7 +1,7 @@
{
"name": "gmp",
"version": "6.2.1",
"port-version": 15,
"port-version": 16,
"description": "The GNU Multiple Precision Arithmetic Library",
"homepage": "https://gmplib.org",
"license": "LGPL-3.0-only OR GPL-2.0-only",
@ -18,7 +18,7 @@
"features": {
"fat": {
"description": "Enable runtime selection of optimized low level routines",
"supports": "x86 | x64"
"supports": "(x86 | x64) & !(mingw & !static)"
}
}
}

View File

@ -2806,7 +2806,7 @@
},
"gmp": {
"baseline": "6.2.1",
"port-version": 15
"port-version": 16
},
"gmsh": {
"baseline": "4.9.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dfe62625c288d20cd69758931e19feda98c7e3e8",
"version": "6.2.1",
"port-version": 16
},
{
"git-tree": "3c2b66f41d7f45ed83f7819067abe6bf2c6718b3",
"version": "6.2.1",