From aa70a996eae7376396a5dd8a9e5105bebb6bc72c Mon Sep 17 00:00:00 2001
From: Matthias Wolf <freebsd@rheinwolf.de>
Date: Tue, 1 Feb 2022 18:38:49 +0100
Subject: www/chromium: update to 97.0.4692.99

Note that the port is currently broken on i386 as it does not compile there.
Security:	https://vuxml.freebsd.org/freebsd/51496cbc-7a0e-11ec-a323-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/9eeccbf3-6e26-11ec-bb10-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/fb9ba490-5cc4-11ec-aac7-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/18ac074c-579f-11ec-aac7-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/b8c0cbca-472d-11ec-83dc-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/976d7bf9-38ea-11ec-b3b0-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/bdaecfad-3117-11ec-b3b0-3065ec8fd3ec.html
---
 .../files/patch-build_toolchain_gcc__toolchain.gni | 31 +++++++---------------
 1 file changed, 9 insertions(+), 22 deletions(-)

(limited to 'www/chromium/files/patch-build_toolchain_gcc__toolchain.gni')

diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index f27a62b5d4f3..02a487657479 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,6 +1,6 @@
---- build/toolchain/gcc_toolchain.gni.orig	2021-09-14 01:51:47 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2022-01-20 10:35:46 UTC
 +++ build/toolchain/gcc_toolchain.gni
-@@ -48,6 +48,11 @@ if (enable_resource_allowlist_generation) {
+@@ -49,6 +49,11 @@ if (enable_resource_allowlist_generation) {
        "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
  }
  
@@ -12,28 +12,15 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -666,20 +671,32 @@ template("gcc_toolchain") {
- # actually just be doing a native compile. The invoker can optionally override
+@@ -731,13 +736,23 @@ template("gcc_toolchain") {
  # use_gold too.
  template("clang_toolchain") {
--  if (defined(invoker.toolprefix)) {
--    toolprefix = invoker.toolprefix
--  } else {
--    toolprefix = ""
-+  if (!is_bsd) {
-+    if (defined(invoker.toolprefix)) {
-+      toolprefix = invoker.toolprefix
-+    } else {
-+      toolprefix = ""
-+    }
-   }
- 
    gcc_toolchain(target_name) {
 -    prefix = rebase_path("$clang_base_path/bin", root_build_dir)
--    cc = "$prefix/clang"
--    cxx = "$prefix/clang++"
+-    cc = "${prefix}/clang"
+-    cxx = "${prefix}/clang++"
 -    ld = cxx
--    readelf = "${toolprefix}readelf"
+-    readelf = "${prefix}/llvm-readelf"
 -    ar = "${prefix}/llvm-ar"
 -    nm = "${prefix}/llvm-nm"
 +    if (is_bsd) {
@@ -46,10 +33,10 @@
 +      nm = "${prefix}/nm"
 +    } else {
 +      prefix = rebase_path("$clang_base_path/bin", root_build_dir)
-+      cc = "$prefix/clang"
-+      cxx = "$prefix/clang++"
++      cc = "${prefix}/clang"
++      cxx = "${prefix}/clang++"
 +      ld = cxx
-+      readelf = "${toolprefix}readelf"
++      readelf = "${prefix}/llvm-readelf"
 +      ar = "${prefix}/llvm-ar"
 +      nm = "${prefix}/llvm-nm"
 +    }
-- 
cgit v1.2.3