This is an automated email from the ASF dual-hosted git repository. alexey pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit a76f2bf89e447d825d6f0aa7dfece27326df8533 Author: Alexey Serbin <[email protected]> AuthorDate: Mon Dec 16 14:23:56 2024 -0800 [thirdparty] update libev up to 4.33 version This update allows for getting rid of extra patches on top of the libev sources from the upstream distribution, at least. Change-Id: I44e8e0c5f8163b76f16e07c90de2909b188f2d78 Reviewed-on: http://gerrit.cloudera.org:8080/22221 Tested-by: Alexey Serbin <[email protected]> Reviewed-by: Marton Greber <[email protected]> Reviewed-by: Gabriella Lotz <[email protected]> --- thirdparty/download-thirdparty.sh | 5 ++--- thirdparty/patches/libev-c17.patch | 37 ------------------------------------- thirdparty/vars.sh | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index 74d356d88..fe2368fca 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -260,12 +260,11 @@ fetch_and_patch \ $ZLIB_SOURCE \ $ZLIB_PATCHLEVEL -LIBEV_PATCHLEVEL=1 +LIBEV_PATCHLEVEL=0 fetch_and_patch \ libev-${LIBEV_VERSION}.tar.gz \ $LIBEV_SOURCE \ - $LIBEV_PATCHLEVEL \ - "patch -p1 < $TP_DIR/patches/libev-c17.patch" + $LIBEV_PATCHLEVEL RAPIDJSON_PATCHLEVEL=3 fetch_and_patch \ diff --git a/thirdparty/patches/libev-c17.patch b/thirdparty/patches/libev-c17.patch deleted file mode 100644 index bf9a5629f..000000000 --- a/thirdparty/patches/libev-c17.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ef89859726b03245ff49e48999fc5f2e4b447b42 Mon Sep 17 00:00:00 2001 -From: Grant Henke <[email protected]> -Date: Mon, 23 Nov 2020 17:06:38 -0600 -Subject: [PATCH] Fix usage with C++17 - -When using with C++17 I got the following error: -ev++.h:355:46: error: ISO C++1z does not allow dynamic exception specifications - dynamic_loop (unsigned int flags = AUTO) throw (bad_loop) - -This patch fixes the error by replacing `throw (bad_loop)` -with `noexcept(false)`. ---- - ev++.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ev++.h b/ev++.h -index 4f0a36a..361bf5a 100644 ---- a/ev++.h -+++ b/ev++.h -@@ -352,7 +352,7 @@ namespace ev { - struct dynamic_loop : loop_ref - { - -- dynamic_loop (unsigned int flags = AUTO) throw (bad_loop) -+ dynamic_loop (unsigned int flags = AUTO) noexcept(false) - : loop_ref (ev_loop_new (flags)) - { - if (!EV_AX) -@@ -376,7 +376,7 @@ namespace ev { - - struct default_loop : loop_ref - { -- default_loop (unsigned int flags = AUTO) throw (bad_loop) -+ default_loop (unsigned int flags = AUTO) noexcept(false) - #if EV_MULTIPLICITY - : loop_ref (ev_default_loop (flags)) - #endif \ No newline at end of file diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 76d91a958..d95e5d986 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -81,7 +81,7 @@ ZLIB_VERSION=1.2.11 ZLIB_NAME=zlib-$ZLIB_VERSION ZLIB_SOURCE=$TP_SOURCE_DIR/$ZLIB_NAME -LIBEV_VERSION=4.20 +LIBEV_VERSION=4.33 LIBEV_NAME=libev-$LIBEV_VERSION LIBEV_SOURCE=$TP_SOURCE_DIR/$LIBEV_NAME
