public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/chromium] epel9-next: Fix clang_base_path for flatpak builds
Date: Fri, 07 Aug 2026 16:07:26 GMT [thread overview]
Message-ID: <178611884657.1.5866216626334278741.rpms-chromium-efbbbe1413cb@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/chromium
Branch : epel9-next
Commit : efbbbe1413cb1e3be803460c1f823a79e22ce5bd
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2025-02-21T14:46:11-05:00
Stats : +13/-3 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/chromium/c/efbbbe1413cb1e3be803460c1f823a79e22ce5bd?branch=epel9-next
Log:
Fix clang_base_path for flatpak builds
llvm is no longer in the runtimes now that mesa is an extension, so it is
rebuilt in /app for flatpaks. Therefore, its location must be detected
dynamically. bindgen must also respect it rather than assuming llvm is in
its own prefix.
---
diff --git a/chromium-127-rust-clanglib.patch b/chromium-127-rust-clanglib.patch
index feb4130..3adf978 100644
--- a/chromium-127-rust-clanglib.patch
+++ b/chromium-127-rust-clanglib.patch
@@ -1,7 +1,12 @@
diff -up chromium-127.0.6533.72/build/rust/rust_bindgen.gni.me chromium-127.0.6533.72/build/rust/rust_bindgen.gni
--- chromium-127.0.6533.72/build/rust/rust_bindgen.gni.me 2024-07-25 16:11:18.754551595 +0200
+++ chromium-127.0.6533.72/build/rust/rust_bindgen.gni 2024-07-25 16:11:33.997837660 +0200
-@@ -22,7 +22,7 @@ _libclang_path = rust_bindgen_root
+@@ -19,11 +19,11 @@
+
+ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
+ # ../lib.
+-_libclang_path = rust_bindgen_root
++_libclang_path = clang_base_path
if (host_os == "win") {
_libclang_path += "/bin"
} else {
@@ -68,7 +73,12 @@ diff -up chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib chrom
diff -up chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni.me chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni
--- chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni.me 2024-12-31 15:08:27.013151672 +0100
+++ chromium-132.0.6834.57/build/rust/rust_bindgen_generator.gni 2024-12-31 15:08:49.538663024 +0100
-@@ -22,7 +22,7 @@ _libclang_path = rust_bindgen_root
+@@ -18,11 +18,11 @@
+
+ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
+ # ../lib.
+-_libclang_path = rust_bindgen_root
++_libclang_path = clang_base_path
if (host_os == "win") {
_libclang_path += "/bin"
} else {
diff --git a/chromium.spec b/chromium.spec
index 14307b7..7310c8d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1248,7 +1248,7 @@ rust_sysroot_absolute="$(rustc --print sysroot)"
# set clang version
clang_version="$(clang --version | sed -n 's/clang version //p' | cut -d. -f1)"
%if 0%{?fedora} > 41
-clang_base_path="/usr"
+clang_base_path="$(which clang | sed 's#/bin/.*##')"
%else
clang_base_path="$(clang --version | grep InstalledDir | cut -d' ' -f2 | sed 's#/bin##')"
%endif
reply other threads:[~2026-08-07 16:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178611884657.1.5866216626334278741.rpms-chromium-efbbbe1413cb@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox