git: 3b8a0e985946 - 2024Q3 - www/{*chromium,iridium}: revert hardcoded paths that sneaked in
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 28 Aug 2024 10:32:15 UTC
The branch 2024Q3 has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3b8a0e985946a867277298c4fd7d5363f56bdfae
commit 3b8a0e985946a867277298c4fd7d5363f56bdfae
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2024-08-28 10:30:18 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2024-08-28 10:32:09 +0000
www/{*chromium,iridium}: revert hardcoded paths that sneaked in
PR: 281104
(cherry picked from commit d0c3a2d4b6bfcdd482143cde1f7e459461482e40)
---
www/chromium/files/patch-build_rust_rust__bindgen.gni | 6 +++---
www/iridium/files/patch-build_rust_rust__bindgen.gni | 6 +++---
www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/www/chromium/files/patch-build_rust_rust__bindgen.gni b/www/chromium/files/patch-build_rust_rust__bindgen.gni
index 90a5d9c25aea..41ce8114edd8 100644
--- a/www/chromium/files/patch-build_rust_rust__bindgen.gni
+++ b/www/chromium/files/patch-build_rust_rust__bindgen.gni
@@ -1,11 +1,11 @@
---- build/rust/rust_bindgen.gni.orig 2024-08-26 12:06:38 UTC
+--- build/rust/rust_bindgen.gni.orig 2024-07-30 19:22:51 UTC
+++ build/rust/rust_bindgen.gni
@@ -11,14 +11,14 @@ if (is_win) {
import("//build/toolchain/win/win_toolchain_data.gni")
}
-_bindgen_path = "${rust_bindgen_root}/bin/bindgen"
-+_bindgen_path = "/usr/local/bin/bindgen"
++_bindgen_path = "${LOCALBASE}/bin/bindgen"
if (host_os == "win") {
_bindgen_path = "${_bindgen_path}.exe"
}
@@ -13,7 +13,7 @@
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
# ../lib.
-_libclang_path = rust_bindgen_root
-+_libclang_path = "/usr/local/llvm17"
++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}"
if (host_os == "win") {
_libclang_path += "/bin"
} else {
diff --git a/www/iridium/files/patch-build_rust_rust__bindgen.gni b/www/iridium/files/patch-build_rust_rust__bindgen.gni
index 75676be2d39c..e0d9446aeb7b 100644
--- a/www/iridium/files/patch-build_rust_rust__bindgen.gni
+++ b/www/iridium/files/patch-build_rust_rust__bindgen.gni
@@ -1,11 +1,11 @@
---- build/rust/rust_bindgen.gni.orig 2024-08-27 06:28:16 UTC
+--- build/rust/rust_bindgen.gni.orig 2024-08-01 05:47:53 UTC
+++ build/rust/rust_bindgen.gni
@@ -11,14 +11,14 @@ if (is_win) {
import("//build/toolchain/win/win_toolchain_data.gni")
}
-_bindgen_path = "${rust_bindgen_root}/bin/bindgen"
-+_bindgen_path = "/usr/local/bin/bindgen"
++_bindgen_path = "${LOCALBASE}/bin/bindgen"
if (host_os == "win") {
_bindgen_path = "${_bindgen_path}.exe"
}
@@ -13,7 +13,7 @@
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
# ../lib.
-_libclang_path = rust_bindgen_root
-+_libclang_path = "/usr/local/llvm17"
++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}"
if (host_os == "win") {
_libclang_path += "/bin"
} else {
diff --git a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni
index 54ae139bec4d..92cb9517d705 100644
--- a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni
+++ b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni
@@ -1,11 +1,11 @@
---- build/rust/rust_bindgen.gni.orig 2024-08-26 14:40:28 UTC
+--- build/rust/rust_bindgen.gni.orig 2024-07-31 14:19:23 UTC
+++ build/rust/rust_bindgen.gni
@@ -11,14 +11,14 @@ if (is_win) {
import("//build/toolchain/win/win_toolchain_data.gni")
}
-_bindgen_path = "${rust_bindgen_root}/bin/bindgen"
-+_bindgen_path = "/usr/local/bin/bindgen"
++_bindgen_path = "${LOCALBASE}/bin/bindgen"
if (host_os == "win") {
_bindgen_path = "${_bindgen_path}.exe"
}
@@ -13,7 +13,7 @@
# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in
# ../lib.
-_libclang_path = rust_bindgen_root
-+_libclang_path = "/usr/local/llvm17"
++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}"
if (host_os == "win") {
_libclang_path += "/bin"
} else {