From a8685abe73c168d85a30d9e5fe36abcaddba9b65 Mon Sep 17 00:00:00 2001
From: Geoff Martin <geoff.martin@zettascale.tech>
Date: Tue, 22 Oct 2024 18:52:01 +0100
Subject: [PATCH] Updated cyclors to a version which mangles C symbols to allow
 different versions of the library to be loaded in the same static binary.

---
 Cargo.lock | 28 +++++++++++++++-------------
 Cargo.toml |  3 ++-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b8e35dc..c741a7a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -534,17 +534,17 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.68.1"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
  "log",
- "peeking_take_while",
  "prettyplease",
  "proc-macro2",
  "quote",
@@ -943,9 +943,8 @@ dependencies = [
 
 [[package]]
 name = "cyclors"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6d5b924d4ce79d0b8c2d7efba9c8d80d67893c4d3eea8bc5b31b320d792804e"
+version = "0.3.3"
+source = "git+https://github.com/ZettaScaleLabs/cyclors.git?branch=issue-24-arm-failure#a106f834ab09f1cc9c3120a626b157f9139fa4b2"
 dependencies = [
  "bincode",
  "bindgen",
@@ -1676,6 +1675,15 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -2177,12 +2185,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -4324,7 +4326,7 @@ dependencies = [
  "flume",
  "futures",
  "git-version",
- "itertools",
+ "itertools 0.13.0",
  "json5",
  "lazy_static",
  "once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index 01091e6..1d53bcd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,8 @@ async-trait = "0.1.66"
 bincode = "1.3.3"
 cdr = "0.2.4"
 clap = "3.2.23"
-cyclors = "=0.3.1"
+#cyclors = "=0.3.3"
+cyclors = { git = "https://github.com/ZettaScaleLabs/cyclors.git", branch = "issue-24-arm-failure" }
 derivative = "2.2.0"
 flume = "0.11.0"
 futures = "0.3.26"