From a4de239f1c65b6696e448365999a3ed7ebc13d62 Mon Sep 17 00:00:00 2001 From: Robbert Segeren Date: Mon, 8 May 2023 17:10:15 +0200 Subject: [PATCH] [gmp] Fix building for linux x86 --- ports/gmp/portfile.cmake | 4 ++++ ports/gmp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gmp.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 127bbda073a724..09ebd530456b4b 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -65,6 +65,10 @@ if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") elseif(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # not exporting asm functions set(disable_assembly ON) +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + vcpkg_list(APPEND OPTIONS "ABI=32") + string(APPEND asmflags " -m32") else() set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") endif() diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 463ba1de211322..2960c09f35f648 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 17, + "port-version": 18, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "license": "LGPL-3.0-only OR GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index d9ce8380a5a7ce..3d3b123613c98a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2870,7 +2870,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 17 + "port-version": 18 }, "gmsh": { "baseline": "4.9.0", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index ff76049a795e91..0b5fa719d94f14 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efae5abe8271dc5c25bfa47b9cc146a29e02dc05", + "version": "6.2.1", + "port-version": 18 + }, { "git-tree": "82d0d40ea6ffa93a17c696a2c2fac9a436d67958", "version": "6.2.1",