From 614954c248bdb7e528dca116512279edf7937a12 Mon Sep 17 00:00:00 2001 From: Julien Enoch Date: Mon, 10 Jun 2024 17:01:41 +0200 Subject: [PATCH 1/3] Use zenoh-c branch dev/reentrant_declares --- zenoh_c_vendor/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt index dd994280..43e76634 100644 --- a/zenoh_c_vendor/CMakeLists.txt +++ b/zenoh_c_vendor/CMakeLists.txt @@ -22,9 +22,10 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=zenoh/shared # - https://github.com/eclipse-zenoh/zenoh/pull/1021 (fix timeout issue with queries) # - https://github.com/eclipse-zenoh/zenoh/pull/1022 (fix empty messages received if payload >btach size) # - https://github.com/eclipse-zenoh/zenoh-c/pull/358 (fix debian packaging issue: https://github.com/jspricke/ros-deb-builder-action/issues/49) +# - https://github.com/eclipse-zenoh/zenoh/pull/xxxx (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/198) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git - VCS_VERSION 390ec14e1b3785cd771bd6931db65062222bb735 + VCS_VERSION ce07cb5461944017c07fc9b42fe0ce7769543ecc CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" ) From f697984f66373916bdc856f1acd213de16f53689 Mon Sep 17 00:00:00 2001 From: Julien Enoch Date: Tue, 11 Jun 2024 13:56:55 +0200 Subject: [PATCH 2/3] Use zenoh-c 87b515b with zenoh 5191af2 --- zenoh_c_vendor/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt index 43e76634..62bd6dec 100644 --- a/zenoh_c_vendor/CMakeLists.txt +++ b/zenoh_c_vendor/CMakeLists.txt @@ -22,10 +22,10 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=zenoh/shared # - https://github.com/eclipse-zenoh/zenoh/pull/1021 (fix timeout issue with queries) # - https://github.com/eclipse-zenoh/zenoh/pull/1022 (fix empty messages received if payload >btach size) # - https://github.com/eclipse-zenoh/zenoh-c/pull/358 (fix debian packaging issue: https://github.com/jspricke/ros-deb-builder-action/issues/49) -# - https://github.com/eclipse-zenoh/zenoh/pull/xxxx (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/198) +# - https://github.com/eclipse-zenoh/zenoh/pull/xxxx (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/182) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git - VCS_VERSION ce07cb5461944017c07fc9b42fe0ce7769543ecc + VCS_VERSION 87b515b4c3dd028f9e9476e3bb60016f7acc3489 CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" ) From 91675f96d981edb4e9d163f409e640643cfaa2e6 Mon Sep 17 00:00:00 2001 From: Julien Enoch Date: Tue, 18 Jun 2024 10:04:00 +0200 Subject: [PATCH 3/3] Use zenoh-c 548ee8d with zenoh 93f93d2 --- zenoh_c_vendor/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zenoh_c_vendor/CMakeLists.txt b/zenoh_c_vendor/CMakeLists.txt index 62bd6dec..7903e1e8 100644 --- a/zenoh_c_vendor/CMakeLists.txt +++ b/zenoh_c_vendor/CMakeLists.txt @@ -22,10 +22,10 @@ set(ZENOHC_CARGO_FLAGS "--no-default-features$--features=zenoh/shared # - https://github.com/eclipse-zenoh/zenoh/pull/1021 (fix timeout issue with queries) # - https://github.com/eclipse-zenoh/zenoh/pull/1022 (fix empty messages received if payload >btach size) # - https://github.com/eclipse-zenoh/zenoh-c/pull/358 (fix debian packaging issue: https://github.com/jspricke/ros-deb-builder-action/issues/49) -# - https://github.com/eclipse-zenoh/zenoh/pull/xxxx (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/182) +# - https://github.com/eclipse-zenoh/zenoh/pull/1150 (fix deadlock issue https://github.com/ros2/rmw_zenoh/issues/182) ament_vendor(zenoh_c_vendor VCS_URL https://github.com/eclipse-zenoh/zenoh-c.git - VCS_VERSION 87b515b4c3dd028f9e9476e3bb60016f7acc3489 + VCS_VERSION 548ee8dde0f53a58c06e68a2949949b31140c36c CMAKE_ARGS "-DZENOHC_CARGO_FLAGS=${ZENOHC_CARGO_FLAGS}" )