From 6de016f75347b01854614c46dcc8e34f0c22fc1b Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 11:28:30 -0600 Subject: [mpfr] add MPFR_USE_INTMAX_T --- ports/mpfr/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt index 3fb121b76..733e6d183 100644 --- a/ports/mpfr/CMakeLists.txt +++ b/ports/mpfr/CMakeLists.txt @@ -250,6 +250,7 @@ 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 MPFR_USE_INTMAX_T) if(BUILD_SHARED_LIBS) target_compile_definitions(mpfr PRIVATE __GMP_LIBGMP_DLL) endif() -- cgit v1.2.3 From 51c9c6eb619b35cab4e3875d3474e6fed148f80d Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 11:49:09 -0600 Subject: [mpfr] prepend stdint to header --- ports/mpfr/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 0e82d2623..bd15515b3 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -10,6 +10,11 @@ vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) +# Prepend stdint to the mpfr header +file(READ "${SOURCE_PATH}/mpfr.h" _contents) +string(CONCAT _contents "#include \"stdint.h\"\n" ${_contents}) +file(READ "${SOURCE_PATH}/mpfr.h" ${_contents}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} ) -- cgit v1.2.3 From 7dda8dcdd038be809dc5ecdd5d7b1020a90b0f11 Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 11:49:54 -0600 Subject: [mpfr] fix portfile --- ports/mpfr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index bd15515b3..acda3702c 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -13,7 +13,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) # Prepend stdint to the mpfr header file(READ "${SOURCE_PATH}/mpfr.h" _contents) string(CONCAT _contents "#include \"stdint.h\"\n" ${_contents}) -file(READ "${SOURCE_PATH}/mpfr.h" ${_contents}) +file(WRITE "${SOURCE_PATH}/mpfr.h" ${_contents}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From d0f6656b55284e3ec65a83528711445d6df6ee02 Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 11:56:17 -0600 Subject: [mpfr] fix source path --- ports/mpfr/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index acda3702c..db32d43b9 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -11,9 +11,9 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) # Prepend stdint to the mpfr header -file(READ "${SOURCE_PATH}/mpfr.h" _contents) +file(READ "${SOURCE_PATH}/src/mpfr.h" _contents) string(CONCAT _contents "#include \"stdint.h\"\n" ${_contents}) -file(WRITE "${SOURCE_PATH}/mpfr.h" ${_contents}) +file(WRITE "${SOURCE_PATH}/src/mpfr.h" ${_contents}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From e0362393cfb4555b3928239aa7ae40b888203359 Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 12:17:31 -0600 Subject: [mpfr] define have_stdint_h --- ports/mpfr/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mpfr/CMakeLists.txt b/ports/mpfr/CMakeLists.txt index 733e6d183..ed48eaf59 100644 --- a/ports/mpfr/CMakeLists.txt +++ b/ports/mpfr/CMakeLists.txt @@ -250,7 +250,7 @@ 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 MPFR_USE_INTMAX_T) +target_compile_definitions(mpfr PRIVATE HAVE_STDINT_H) if(BUILD_SHARED_LIBS) target_compile_definitions(mpfr PRIVATE __GMP_LIBGMP_DLL) endif() -- cgit v1.2.3 From 8c6eb97ec7b1acb2dc1289910689a6ff76792f5b Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 12:17:53 -0600 Subject: [mpfr] revert portfile patch --- ports/mpfr/portfile.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index db32d43b9..0e82d2623 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -10,11 +10,6 @@ vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) -# Prepend stdint to the mpfr header -file(READ "${SOURCE_PATH}/src/mpfr.h" _contents) -string(CONCAT _contents "#include \"stdint.h\"\n" ${_contents}) -file(WRITE "${SOURCE_PATH}/src/mpfr.h" ${_contents}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} ) -- cgit v1.2.3 From b12e76cd60025cf22e5191dafac8256086cbad82 Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 12:23:46 -0600 Subject: [mpfr] prefer ninja --- ports/mpfr/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 0e82d2623..0a192f168 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -12,6 +12,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/gmp_printf.c DESTINATION ${SOURCE_PATH}/src) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() -- cgit v1.2.3 From 9bc2ba5357ebd8c8daf0dfae9511a5a6b16aa11a Mon Sep 17 00:00:00 2001 From: xoviat Date: Wed, 29 Nov 2017 12:33:08 -0600 Subject: [mpfr] bump version --- ports/mpfr/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index 8482ed8eb..fdfe6deb0 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,4 +1,4 @@ Source: mpfr -Version: 3.1.6-1 +Version: 3.1.6-2 Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding Build-Depends: mpir -- cgit v1.2.3