diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-08-05 10:33:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 10:33:48 -0700 |
| commit | 6a83b5365e8fc48c41564d319f915cbff603c99e (patch) | |
| tree | 2bf1d73e51ee88c7fa766d2d47edbebd7c3f7193 | |
| parent | 0e477d784323ad91919a18da27b5f9f31d3a0c5a (diff) | |
| download | vcpkg-6a83b5365e8fc48c41564d319f915cbff603c99e.tar.gz vcpkg-6a83b5365e8fc48c41564d319f915cbff603c99e.zip | |
[mpir] fix on linux (#12723)
* [mpir] fix on linux
the fix in #12677 broke linux while fixing macOS
fixes #12708
* back to working on osx
* Update Port-Version in vcpkg.json
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
| -rw-r--r-- | ports/mpir/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/mpir/vcpkg.json | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index f5a85766d..e3ef1dc9d 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -30,11 +30,17 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) 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") + string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") + string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") + + # on Linux, autoconf is required; on macOS, it isn't + if(VCPKG_TARGET_IS_LINUX) + set(AUTOCONFIG "AUTOCONFIG") + endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} + ${AUTOCONFIG} OPTIONS ${OPTIONS} ) diff --git a/ports/mpir/vcpkg.json b/ports/mpir/vcpkg.json index fa1f7e5c9..29754ccd9 100644 --- a/ports/mpir/vcpkg.json +++ b/ports/mpir/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpir", "version-string": "3.0.0", - "port-version": 9, + "port-version": 10, "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", "supports": "!(uwp | arm)" |