From e4411a7dceb99a2c7dcee58b35d293019cd34486 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 13 Jun 2022 10:52:37 +0200 Subject: [PATCH 1/2] [gmp] [mpir] Add --with-pic --- ports/gmp/portfile.cmake | 1 + ports/gmp/vcpkg.json | 2 +- ports/mpir/portfile.cmake | 6 +++--- ports/mpir/vcpkg.json | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index b4acb3047bfb94..2138744fcb40a4 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -49,6 +49,7 @@ vcpkg_configure_make( OPTIONS ${OPTIONS} --enable-cxx + --with-pic ) set(tool_names bases fac fib jacobitab psqr trialdivtab) diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 8393feed120dcb..12a6e0d4332c43 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 9, + "port-version": 10, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index 1b8e188c32d80b..db2e2163e0bc35 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -19,12 +19,12 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_find_acquire_program(YASM) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SHARED_STATIC "--enable-static --disable-shared") + set(SHARED_STATIC --enable-static --disable-shared --with-pic) else() - set(SHARED_STATIC "--disable-static --enable-shared") + set(SHARED_STATIC --disable-static --enable-shared) endif() - set(OPTIONS "--disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}") + set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") diff --git a/ports/mpir/vcpkg.json b/ports/mpir/vcpkg.json index 3d5a05a43ed122..5a9c0cc9f59bc0 100644 --- a/ports/mpir/vcpkg.json +++ b/ports/mpir/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mpir", "version-date": "2022-03-02", + "port-version": 1, "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", "license": "GPL-3.0-only", From 0b783a7b445fcfba16aa691e208f1a392c9d7abf Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 13 Jun 2022 10:53:37 +0200 Subject: [PATCH 2/2] ./vcpkg x-add-version --all --- versions/baseline.json | 4 ++-- versions/g-/gmp.json | 5 +++++ versions/m-/mpir.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index bb54b660c8839e..e0e37c51932712 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2606,7 +2606,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 9 + "port-version": 10 }, "gmsh": { "baseline": "4.9.0", @@ -4686,7 +4686,7 @@ }, "mpir": { "baseline": "2022-03-02", - "port-version": 0 + "port-version": 1 }, "mpmcqueue": { "baseline": "2021-12-01", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 9505d80d19d521..2a4b1a1f2f0c7c 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4748213535c3fd004de44f6b1f15d123927cce6", + "version": "6.2.1", + "port-version": 10 + }, { "git-tree": "7b9a71843073bf4a86bb64ddf219c9900ebb3dbd", "version": "6.2.1", diff --git a/versions/m-/mpir.json b/versions/m-/mpir.json index ff850fbcd28ccd..8f7790807ec5c8 100644 --- a/versions/m-/mpir.json +++ b/versions/m-/mpir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9191f07cfaade82121abb4d37cb652182c0e55f6", + "version-date": "2022-03-02", + "port-version": 1 + }, { "git-tree": "5358d4a724061eab499969ae3b56f8abbdea3347", "version-date": "2022-03-02",