diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 1e3a207685..127bbda073 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -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}") diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 7dd7c15258..f81846876a 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -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)" } } } diff --git a/versions/baseline.json b/versions/baseline.json index e21325ffe2..bcc4a0de9f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2806,7 +2806,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 15 + "port-version": 16 }, "gmsh": { "baseline": "4.9.0", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index e53be293c9..157e0b090c 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfe62625c288d20cd69758931e19feda98c7e3e8", + "version": "6.2.1", + "port-version": 16 + }, { "git-tree": "3c2b66f41d7f45ed83f7819067abe6bf2c6718b3", "version": "6.2.1",