summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-build_config_sysroot.gni
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2020-06-02 20:30:55 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2020-06-02 20:30:55 +0000
commit8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch)
treec272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium/files/patch-build_config_sysroot.gni
parentmultimedia/libva-intel-driver: update to 2.4.1 (diff)
www/chromium: Update to version 83.0.4103.61
Submitted by: Matthias Wolf <freebsd@rheinwolf.de> Reviewed by: rene Approved by: chromium@ (rene) Obtained from: https://github.com/gliaskos/freebsd-chromium MFH: 2020Q2 Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html Differential Revision: https://reviews.freebsd.org/D25102
Notes
Notes: svn path=/head/; revision=537579
Diffstat (limited to 'www/chromium/files/patch-build_config_sysroot.gni')
-rw-r--r--www/chromium/files/patch-build_config_sysroot.gni13
1 files changed, 6 insertions, 7 deletions
diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni
index 83a58cad544a..8b68404769fb 100644
--- a/www/chromium/files/patch-build_config_sysroot.gni
+++ b/www/chromium/files/patch-build_config_sysroot.gni
@@ -1,15 +1,14 @@
---- build/config/sysroot.gni.orig 2019-03-11 22:00:52 UTC
+--- build/config/sysroot.gni.orig 2020-05-13 18:39:36 UTC
+++ build/config/sysroot.gni
-@@ -15,9 +15,10 @@ declare_args() {
- # The absolute path to directory containing linux sysroot images
- target_sysroot_dir = "//build/linux"
+@@ -21,9 +21,9 @@ declare_args() {
+ # Controls default is_linux sysroot. If set to true, and sysroot
+ # is empty, default sysroot is calculated.
- use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
-+ use_sysroot = !is_bsd && (
-+ current_cpu == "x86" || current_cpu == "x64" ||
++ use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" ||
current_cpu == "arm" || current_cpu == "arm64" ||
- current_cpu == "mipsel" || current_cpu == "mips64el"
+ current_cpu == "mipsel" || current_cpu == "mips64el")
}
- if (current_os == target_os && current_cpu == target_cpu &&
+ if (sysroot == "") {