diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-06-06 02:49:40 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-06-05 11:49:40 -0700 |
| commit | aeebab7dc5558ec6315dcc463a70cad692e4e8c1 (patch) | |
| tree | 9b83717a00948b9d2b87a41f3a112f6d4c9e1745 | |
| parent | b3b526afc70660ee983eb0641d6b6142fa7afa78 (diff) | |
| download | vcpkg-aeebab7dc5558ec6315dcc463a70cad692e4e8c1.tar.gz vcpkg-aeebab7dc5558ec6315dcc463a70cad692e4e8c1.zip | |
[arb]Upgrade version to 2.16.0 and fix build error. (#6763)
| -rw-r--r-- | ports/arb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/arb/fix-build-error.patch | 24 | ||||
| -rw-r--r-- | ports/arb/portfile.cmake | 10 |
3 files changed, 30 insertions, 6 deletions
diff --git a/ports/arb/CONTROL b/ports/arb/CONTROL index 540eedaee..750543298 100644 --- a/ports/arb/CONTROL +++ b/ports/arb/CONTROL @@ -1,4 +1,4 @@ Source: arb
-Version: 2.11.1-2
+Version: 2.16.0
Description: a C library for arbitrary-precision interval arithmetic
Build-Depends: flint
diff --git a/ports/arb/fix-build-error.patch b/ports/arb/fix-build-error.patch new file mode 100644 index 000000000..7ed2428cf --- /dev/null +++ b/ports/arb/fix-build-error.patch @@ -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; + } + diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake index 847120318..3c1196283 100644 --- a/ports/arb/portfile.cmake +++ b/ports/arb/portfile.cmake @@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fredrik-johansson/arb - REF 2.11.1 - SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353 + REF 2.16.0 + SHA512 171c965aeb03cd2830df8a53990403c6da480a94d44385dadfbb2d02697f7c03e8b9a217094b0ad93f796d889a1564f4b9ae9db35ef9de90f61bb2e3220911be HEAD_REF master + PATCHES fix-build-error.patch ) file(REMOVE ${SOURCE_PATH}/CMakeLists.txt) @@ -21,9 +22,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +# Remove duplicate headers +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle 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) |