fix linux/android builds

n0-computer · Nov 26, 2024 · 97826cf · 97826cf
1 parent 5072073
commit 97826cf
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/iroh-net/Cargo.toml b/iroh-net/Cargo.toml
@@ -125,11 +125,17 @@ swarm-discovery = { version = "0.2.1", optional = true }
 # dht_discovery
 genawaiter = { version = "0.99", features = ["futures03"], optional = true }
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
+[target.'cfg(all(target_os = "linux", not(target_os = "android")))'.dependencies]
 netlink-packet-core = "0.7.0"
-netlink-packet-route = "0.19.0" # 0.20/21 is blocked on rtnetlink bumping its dependency
+netlink-packet-route = "0.21"
 netlink-sys = "0.8.6"
-rtnetlink = "0.14.1"
+rtnetlink = "=0.14.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
+
+[target.'cfg(target_os = "android")'.dependencies]
+netlink-packet-core = "0.7.0"
+netlink-packet-route = "0.19" # 0.20/21 is blocked on rtnetlink bumping its dependency
+netlink-sys = "0.8.6"
+rtnetlink = "=0.13.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
 
 [target.'cfg(target_os = "windows")'.dependencies]
 wmi = "0.14"

diff --git a/net-tools/netwatch/Cargo.toml b/net-tools/netwatch/Cargo.toml
@@ -28,11 +28,17 @@ tokio = { version = "1", features = ["io-util", "macros", "sync", "rt", "net", "
 tokio-util = { version = "0.7", features = ["rt"] }
 tracing = "0.1"
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
+[target.'cfg(all(target_os = "linux", not(target_os = "android")))'.dependencies]
 netlink-packet-core = "0.7.0"
-netlink-packet-route = "0.19.0" # 0.21.0 is blocked on rtnetlink bumping its dependency
+netlink-packet-route = "0.19" # 0.20/21 is blocked on rtnetlink bumping its dependency
 netlink-sys = "0.8.6"
-rtnetlink = "0.14.1"
+rtnetlink = "=0.14.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
+
+[target.'cfg(target_os = "android")'.dependencies]
+netlink-packet-core = "0.7.0"
+netlink-packet-route = "0.19" # 0.20/21 is blocked on rtnetlink bumping its dependency
+netlink-sys = "0.8.6"
+rtnetlink = "=0.13.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
 
 [target.'cfg(target_os = "windows")'.dependencies]
 wmi = "0.14"