From 198d8793ea83af5ac45871c3ef3109eb83e72f9f Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Fri, 13 Sep 2024 13:32:27 +0200
Subject: [PATCH] fix(armv6): make `coap` example deps use portable atomics

---
 Cargo.lock               | 7 +++++--
 Cargo.toml               | 3 +++
 deny.toml                | 1 +
 examples/coap/Cargo.toml | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c9cc8c88f..ce540657c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4190,6 +4190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b2975e035ce16539eecee08d7c6e5626ca26f299c6e90af343b302c6dd2e61e"
 dependencies = [
  "alloc-traits",
+ "atomic-polyfill",
 ]
 
 [[package]]
@@ -4526,8 +4527,10 @@ dependencies = [
 [[package]]
 name = "try-lock"
 version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+source = "git+https://github.com/seanmonstar/try-lock?rev=a1aadfac9840fe23672159c12af7272e44bc684c#a1aadfac9840fe23672159c12af7272e44bc684c"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "trybuild"
diff --git a/Cargo.toml b/Cargo.toml
index f1d8b97d8..d17809d4e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -131,6 +131,9 @@ embassy-usb-driver = { git = "https://github.com/kaspar030/embassy", branch = "f
 cyw43 = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-2024-08-18" }
 cyw43-pio = { git = "https://github.com/kaspar030/embassy", branch = "for-riot-rs-2024-08-18" }
 
+# patched to use portable-atomics <https://github.com/seanmonstar/try-lock/pull/11>
+try-lock = { git = "https://github.com/seanmonstar/try-lock", rev = "a1aadfac9840fe23672159c12af7272e44bc684c" }
+
 # version 0.12-to-be
 smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp.git", rev = "125773e282bc2e0c914a49e9c75573926e26e558" }
 
diff --git a/deny.toml b/deny.toml
index 1f4ef2d60..7eab5129f 100644
--- a/deny.toml
+++ b/deny.toml
@@ -51,6 +51,7 @@ allow-git = [
   "https://github.com/smoltcp-rs/smoltcp",
   "https://github.com/twitchyliquid64/usbd-hid",
   "https://gitlab.com/oscore/liboscore",
+  "https://github.com/seanmonstar/try-lock",
 ]
 
 [sources.allow-org]
diff --git a/examples/coap/Cargo.toml b/examples/coap/Cargo.toml
index 51d18f8a0..26a3ec467 100644
--- a/examples/coap/Cargo.toml
+++ b/examples/coap/Cargo.toml
@@ -41,7 +41,7 @@ coap-handler = "0.2.0"
 coap-handler-implementations = "0.5.0"
 hexlit = "0.5.5"
 
-static-alloc = "0.2.5"
+static-alloc = { version = "0.2.5", features = ["polyfill"] }
 coap-scroll-ring-server = "0.2.0"
 scroll-ring = "0.1.1"