From 5caa9f575f527aa8995a0e8b8819cc097092ff83 Mon Sep 17 00:00:00 2001
From: Neil Garb <neil@rokk.com>
Date: Thu, 16 Apr 2026 11:46:43 +0200
Subject: [PATCH 1/2] webrtc-sys: add armv7 (arm-linux-gnueabihf) support

- Add "arm" to arch tables for sysroot and glib header paths
- Use -std=c++2a -fpermissive instead of c++20 (compat with GCC 9 in cross-rs)
- Skip desktop_capturer lazy-load stubs for armv7 (only x64/arm64 stubs exist)
- Add -fPIC on Linux so .o files link into Rust PIE binaries
---
 webrtc-sys/build.rs | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/webrtc-sys/build.rs b/webrtc-sys/build.rs
index 4d779777e..0fb054d62 100644
--- a/webrtc-sys/build.rs
+++ b/webrtc-sys/build.rs
@@ -173,13 +173,16 @@ fn main() {
                 pkg_config::probe_library(lib_name).unwrap();
             }
 
-            add_lazy_load_so(
-                &mut builder,
-                "desktop_capturer",
-                ["drm", "gbm", "X11", "Xfixes", "Xdamage", "Xrandr", "Xcomposite", "Xext"]
-                    .map(String::from)
-                    .to_vec(),
-            );
+            // Lazy-load stubs only exist for x86_64 and aarch64, not armv7
+            if target_arch != "arm" {
+                add_lazy_load_so(
+                    &mut builder,
+                    "desktop_capturer",
+                    ["drm", "gbm", "X11", "Xfixes", "Xdamage", "Xrandr", "Xcomposite", "Xext"]
+                        .map(String::from)
+                        .to_vec(),
+                );
+            }
 
             let x86 = target_arch == "x86_64" || target_arch == "i686";
             let arm = target_arch == "aarch64" || target_arch.contains("arm");
@@ -245,7 +248,11 @@ fn main() {
             builder
                 .flag("-Wno-changes-meaning")
                 .flag("-Wno-deprecated-declarations")
-                .flag("-std=c++20");
+                .flag("-std=c++2a")
+                .flag("-fpermissive")
+                // -fPIC: required for linking into Rust PIE binaries (Yocto uses rust-lld).
+                // CFLAGS propagation can be unreliable in Yocto's cross build, so set explicitly.
+                .flag("-fPIC");
         }
         "macos" => {
             println!("cargo:rustc-link-lib=framework=Foundation");
@@ -406,6 +413,8 @@ fn add_lazy_load_so(builder: &mut cc::Build, name: &str, libraries: Vec<String>)
         let mut arch_dir = "x86_64-linux-gnu";
         if target_arch.contains("arm64") {
             arch_dir = "aarch64-linux-gnu";
+        } else if target_arch == "arm" {
+            arch_dir = "arm-linux-gnueabihf";
         }
         let implib_file_c_name = "src/lazy_load_deps_for/".to_owned()
             + name
@@ -431,7 +440,8 @@ fn add_gio_headers(builder: &mut cc::Build) {
     let target_arch_sysroot = match target_arch.as_str() {
         "arm64" => "arm64",
         "x64" => "amd64",
-        _ => panic!("unsupported arch"),
+        "arm" => "arm",
+        _ => panic!("unsupported arch: {}", target_arch),
     };
     let sysroot_path = format!("include/build/linux/debian_bullseye_{target_arch_sysroot}-sysroot");
     let sysroot = webrtc_dir.join(sysroot_path);
@@ -442,7 +452,8 @@ fn add_gio_headers(builder: &mut cc::Build) {
     let arch_specific_path = match target_arch.as_str() {
         "x64" => "x86_64-linux-gnu",
         "arm64" => "aarch64-linux-gnu",
-        _ => panic!("unsupported target"),
+        "arm" => "arm-linux-gnueabihf",
+        _ => panic!("unsupported target: {}", target_arch),
     };
 
     let glib_path_config = sysroot.join("usr/lib");

From a124dfdb49765bac776db4132f0f5ac8b4c2d551 Mon Sep 17 00:00:00 2001
From: Neil Garb <neil@rokk.com>
Date: Tue, 21 Apr 2026 11:35:42 +0200
Subject: [PATCH 2/2] add changeset

---
 .changeset/webrtc_sys_add_armv7_support.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/webrtc_sys_add_armv7_support.md

diff --git a/.changeset/webrtc_sys_add_armv7_support.md b/.changeset/webrtc_sys_add_armv7_support.md
new file mode 100644
index 000000000..451c3187e
--- /dev/null
+++ b/.changeset/webrtc_sys_add_armv7_support.md
@@ -0,0 +1,7 @@
+---
+webrtc-sys: patch
+libwebrtc: patch
+livekit-ffi: patch
+---
+
+webrtc-sys: add armv7 (arm-linux-gnueabihf) support - #1021 (@neilgarb)