aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackBoosY <47264268+JackBoosY@users.noreply.github.com>2019-11-01 04:04:30 +0800
committerRobert Schumacher <roschuma@microsoft.com>2019-10-31 13:04:30 -0700
commitd2cd3ad6625b92bc7901208013a9e87739d27f3f (patch)
tree8b1623fdff412ea301d0059ffd510387193b761f
parent81fbbf8d964c111063b1e58dac61bc20c38e37f9 (diff)
downloadvcpkg-d2cd3ad6625b92bc7901208013a9e87739d27f3f.tar.gz
vcpkg-d2cd3ad6625b92bc7901208013a9e87739d27f3f.zip
[arb]Upgrade to 2.17.0 (#8831)
-rw-r--r--ports/arb/CONTROL2
-rw-r--r--ports/arb/fix-build-error.patch24
-rw-r--r--ports/arb/portfile.cmake9
3 files changed, 4 insertions, 31 deletions
diff --git a/ports/arb/CONTROL b/ports/arb/CONTROL
index 02baf69b8..7103a96b4 100644
--- a/ports/arb/CONTROL
+++ b/ports/arb/CONTROL
@@ -1,5 +1,5 @@
Source: arb
-Version: 2.16.0
+Version: 2.17.0
Homepage: https://github.com/fredrik-johansson/arb
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
deleted file mode 100644
index 7ed2428cf..000000000
--- a/ports/arb/fix-build-error.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 3c1196283..a87ac40c1 100644
--- a/ports/arb/portfile.cmake
+++ b/ports/arb/portfile.cmake
@@ -1,14 +1,11 @@
-include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fredrik-johansson/arb
- REF 2.16.0
- SHA512 171c965aeb03cd2830df8a53990403c6da480a94d44385dadfbb2d02697f7c03e8b9a217094b0ad93f796d889a1564f4b9ae9db35ef9de90f61bb2e3220911be
+ REF eeef7bdd349366be4d1691da05e49dcf9c01a394 # 2.17.0
+ SHA512 d4c53c0343bec32e0b6c0d3a41e92663b13f9648a08c28c56a3098dd77d71248718b414dbb70c116bd7e07648646bdb663c1b9560e41d971d5c12d2d0466e9a0
HEAD_REF master
- PATCHES fix-build-error.patch
)
file(REMOVE ${SOURCE_PATH}/CMakeLists.txt)
@@ -26,4 +23,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# 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/${PORT} RENAME copyright)