From 733e3e3cd28245f344f0b080cb2dfca56be0b055 Mon Sep 17 00:00:00 2001
From: Rootkit404 <175176948+RKNF404@users.noreply.github.com>
Date: Thu, 2 Oct 2025 21:36:30 -0400
Subject: [PATCH 1/2] chore(build): remove dep on sysroot

---
 patches/remove-sysroot-dependency.patch | 46 +++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 patches/remove-sysroot-dependency.patch

diff --git a/patches/remove-sysroot-dependency.patch b/patches/remove-sysroot-dependency.patch
new file mode 100644
index 00000000..dc9c1a25
--- /dev/null
+++ b/patches/remove-sysroot-dependency.patch
@@ -0,0 +1,46 @@
+Copyright 2024-2025 The Trivalent Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
+---
+diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
+index 24a1d14395..db1b4d3d18 100644
+--- a/build/config/BUILDCONFIG.gn
++++ b/build/config/BUILDCONFIG.gn
+@@ -581,7 +581,7 @@ foreach(_target_type,
+       }
+
+       if (!defined(use_libcxx_modules)) {
+-        use_libcxx_modules = is_clang
++        use_libcxx_modules = false
+       }
+
+       if (filter_include(
+@@ -702,7 +702,7 @@ foreach(_target_type,
+       }
+
+       if (!defined(use_libcxx_modules)) {
+-        use_libcxx_modules = is_clang
++        use_libcxx_modules = false
+       }
+
+       if (filter_include(
+diff --git a/build/config/linux/libffi/BUILD.gn b/build/config/linux/libffi/BUILD.gn
+index 6e45f4c226..37bc80a89c 100644
+--- a/build/config/linux/libffi/BUILD.gn
++++ b/build/config/linux/libffi/BUILD.gn
+@@ -19,6 +19,6 @@ if (use_system_libffi) {
+   }
+ } else {
+   config("libffi") {
+-    libs = [ "ffi_pic" ]
++    libs = [ "ffi" ]
+   }
+ }

From f67d65756651c2a4b86345d57bdedb39161e05be Mon Sep 17 00:00:00 2001
From: Rootkit404 <175176948+RKNF404@users.noreply.github.com>
Date: Thu, 2 Oct 2025 21:38:01 -0400
Subject: [PATCH 2/2] chore(spec): remove sysroot related gn args

---
 build/trivalent.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/trivalent.spec b/build/trivalent.spec
index 883195c3..dad6c4b9 100644
--- a/build/trivalent.spec
+++ b/build/trivalent.spec
@@ -485,7 +485,7 @@ CHROMIUM_GN_DEFINES+=' is_cfi=true use_cfi_cast=true'
 CHROMIUM_GN_DEFINES+=' enable_reporting=false'
 CHROMIUM_GN_DEFINES+=' enable_remoting=false'
 CHROMIUM_GN_DEFINES+=' is_clang=true'
-CHROMIUM_GN_DEFINES+=' use_sysroot=true'
+CHROMIUM_GN_DEFINES+=' use_sysroot=false'
 CHROMIUM_GN_DEFINES+=' target_os="linux"'
 CHROMIUM_GN_DEFINES+=' current_os="linux"'
 CHROMIUM_GN_DEFINES+=' treat_warnings_as_errors=false'
@@ -501,7 +501,6 @@ CHROMIUM_GN_DEFINES+=' use_qt6=true moc_qt6_path="%{_libdir}/qt6/libexec/"'
 CHROMIUM_GN_DEFINES+=' use_pulseaudio=true'
 CHROMIUM_GN_DEFINES+=' rtc_use_pipewire=true rtc_link_pipewire=true'
 CHROMIUM_GN_DEFINES+=' v8_enable_drumbrake=true'
-CHROMIUM_GN_DEFINES+=' use_system_libffi=false' # No longer removing sysroot
 export CHROMIUM_GN_DEFINES
 
 # Check that there is no system 'google' module, shadowing bundled ones: