Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build/trivalent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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:
Expand Down
46 changes: 46 additions & 0 deletions patches/remove-sysroot-dependency.patch
Original file line number Diff line number Diff line change
@@ -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" ]
}
}