mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 03:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[arb]Upgrade version to 2.16.0 and fix build error. (#6763)

Browse Source
This commit is contained in:
JackBoosY 2019-06-06 02:49:40 +08:00 committed by Victor Romero
parent b3b526afc7
commit aeebab7dc5
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/arb/CONTROL
View File

@ -1,4 +1,4 @@
Source: arb Source: arb
Version: 2.11.1-2 Version: 2.16.0
Description: a C library for arbitrary-precision interval arithmetic Description: a C library for arbitrary-precision interval arithmetic
Build-Depends: flint Build-Depends: flint

24
ports/arb/fix-build-error.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/acb_dirichlet/stieltjes.c b/acb_dirichlet/stieltjes.c
index ad6937b..4ca9690 100644
--- a/acb_dirichlet/stieltjes.c
+++ b/acb_dirichlet/stieltjes.c
@@ -340,16 +340,16 @@ stieltjes_mag(double n)
return t;
}
-static double _hypot(double x, double y) { return sqrt(x * x + y * y); }
+static double __hypot(double x, double y) { return sqrt(x * x + y * y); }
/* log2 magnitude of integrand at z = x+yi; alpha = a+bi */
static double
integrand_mag(double n, double x, double y, double a, double b)
{
double t, u;
- t = log(_hypot(a - y, b + x));
+ t = log(__hypot(a - y, b + x));
u = atan2(b + x, a - y);
- t = log(_hypot(t,u)) * (n+1) - 2.0 * 3.1415926535897932 * x;
+ t = log(__hypot(t,u)) * (n+1) - 2.0 * 3.1415926535897932 * x;
return t * 1.44269504088896341;
}

10
ports/arb/portfile.cmake
View File

@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO fredrik-johansson/arb REPO fredrik-johansson/arb
REF 2.11.1 REF 2.16.0
SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353 SHA512 171c965aeb03cd2830df8a53990403c6da480a94d44385dadfbb2d02697f7c03e8b9a217094b0ad93f796d889a1564f4b9ae9db35ef9de90f61bb2e3220911be
HEAD_REF master HEAD_REF master
PATCHES fix-build-error.patch
) )
file(REMOVE ${SOURCE_PATH}/CMakeLists.txt) file(REMOVE ${SOURCE_PATH}/CMakeLists.txt)
@ -21,9 +22,8 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Remove duplicate headers
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/arb RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/arb RENAME copyright)
# Remove duplicate headers
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)