diff options
| author | Lennart Trunk <lennart.trunk@outlook.de> | 2019-09-24 20:05:30 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-24 11:05:30 -0700 |
| commit | 45e70a9f786480cbd85d0efc512713c965a02387 (patch) | |
| tree | 46139fb804de953aeb6d8da9fef5cc96e34f535c | |
| parent | de53bb866827d92ad76a309255447c1fc746fd50 (diff) | |
| download | vcpkg-45e70a9f786480cbd85d0efc512713c965a02387.tar.gz vcpkg-45e70a9f786480cbd85d0efc512713c965a02387.zip | |
update mpfr to 4.0.2 and fix build on osx (#8324)
* update mpfr to 4.0.2
| -rw-r--r-- | ports/mpfr/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/mpfr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mpfr/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/mpfr/test_stdarg.c | 6 |
4 files changed, 7 insertions, 18 deletions
diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt index f0064666c..6664e991a 100644 --- a/ports/mpfr/CMakeLists.txt +++ b/ports/mpfr/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.3.0) -project(MPFR VERSION 3.1.5 LANGUAGES C) +project(MPFR VERSION 4.0.2 LANGUAGES C) # Find GMP (or MPIR) find_library(GMP_LIBRARY NAMES gmp mpir) @@ -254,15 +254,11 @@ add_library(mpfr ${SRCS}) # target_compile_definitions(mpfr PRIVATE HAVE_CONFIG_H) target_compile_definitions(mpfr PRIVATE __MPFR_WITHIN_MPFR) target_compile_definitions(mpfr PRIVATE HAVE_STDINT_H) +target_compile_definitions(mpfr PRIVATE HAVE_STDARG) if(BUILD_SHARED_LIBS) target_compile_definitions(mpfr PRIVATE __GMP_LIBGMP_DLL) endif() -try_compile(I_HAVE_STDARG ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/test_stdarg.c) -if (I_HAVE_STDARG) - target_compile_definitions(mpfr PRIVATE HAVE_STDARG) -endif (I_HAVE_STDARG) - target_link_libraries(mpfr ${GMP_LIBRARIES}) target_include_directories(mpfr PUBLIC ${GMP_INCLUDE_DIRS}) diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index 6b64b7651..7d2ec7643 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,5 +1,5 @@ Source: mpfr -Version: 4.0.1 +Version: 4.0.2-1 Homepage: https://www.mpfr.org Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding Build-Depends: mpir diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 7e455041b..17f78a2e7 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -1,14 +1,13 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-4.0.1) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-4.0.2) vcpkg_download_distfile(ARCHIVE - URLS "http://www.mpfr.org/mpfr-4.0.1/mpfr-4.0.1.tar.xz" - FILENAME "mpfr-4.0.1.tar.xz" - SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f + URLS "http://www.mpfr.org/mpfr-4.0.2/mpfr-4.0.2.tar.xz" + FILENAME "mpfr-4.0.2.tar.xz" + SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88 ) vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/test_stdarg.c DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/mpfr/test_stdarg.c b/ports/mpfr/test_stdarg.c deleted file mode 100644 index dc1e2d7b4..000000000 --- a/ports/mpfr/test_stdarg.c +++ /dev/null @@ -1,6 +0,0 @@ -# include <stdarg.h> - -int main(int argc, char *argv) { - return 0; -} - |