summaryrefslogtreecommitdiffstats
path: root/recipes-wam/cef/files/chromium/0003-Remove-the-GN-settings-done-for-clang-that-conflict-.patch
diff options
context:
space:
mode:
authorRoger Zanoni <rzanoni@igalia.com>2023-10-22 01:07:31 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-11-16 16:51:05 +0000
commit4a1b172ebda54d587db7ecfc61af5443d0c11d0d (patch)
treee5e39bfbda54a45d33bdd829cf7a3370ede2a88c /recipes-wam/cef/files/chromium/0003-Remove-the-GN-settings-done-for-clang-that-conflict-.patch
parentbcbfd0131bce06c11197d2eee84300897c1680a9 (diff)
[cef][wam] Make the recipe work with official chromium release tarballs
This change drops the chromium mirror repository that was being used for milestone 108 in favor of using the official release tarballs from https://commondatastorage.googleapis.com/chromium-browser-official in an effort to make it easier to upgrade the current chromium milestones (also to improve download and build times). Also, the current milestone is being upgraded from 108 to 118. Bug-AGL: SPEC-3872 Signed-off-by: Roger Zanoni <rzanoni@igalia.com> Change-Id: Iba4a94ef762d278864114c02bb9e36a308ff5a7a Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29417 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'recipes-wam/cef/files/chromium/0003-Remove-the-GN-settings-done-for-clang-that-conflict-.patch')
-rw-r--r--recipes-wam/cef/files/chromium/0003-Remove-the-GN-settings-done-for-clang-that-conflict-.patch116
1 files changed, 0 insertions, 116 deletions
diff --git a/recipes-wam/cef/files/chromium/0003-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/recipes-wam/cef/files/chromium/0003-Remove-the-GN-settings-done-for-clang-that-conflict-.patch
deleted file mode 100644
index 68c37f25a..000000000
--- a/recipes-wam/cef/files/chromium/0003-Remove-the-GN-settings-done-for-clang-that-conflict-.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 22de50ac2371aed1e04e4cb248beabb7f8ad3ebe Mon Sep 17 00:00:00 2001
-From: Roger Zanoni <rzanoni@igalia.com>
-Date: Thu, 27 Apr 2023 16:16:28 +0200
-Subject: [PATCH 3/9] Remove the GN settings done for clang that conflict with
- OE
-
-clang cross compiler that is build with meta-clang has lot of these
-settings built-in and specifying them here confuses the compiler
-
---target option and -no-canonical-prefixes options result in clang
-
-finding the headers in target sysroot
-
-Upstream-Status: Inappropriate [OE-Specific]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Rebased-by: Maksim Sisov <msisov@igalia.com>
-Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
-Rebased-by: Roger Zanoni <rzanoni@igalia.com>
----
- build/config/compiler/BUILD.gn | 37 ----------------------------------
- 1 file changed, 37 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 531b326c498d0..244a6757613d5 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -924,11 +924,6 @@ config("compiler_cpu_abi") {
- ]
- }
- } else if (current_cpu == "arm") {
-- if (is_clang && !is_android && !is_nacl &&
-- !(is_chromeos_lacros && is_chromeos_device)) {
-- cflags += [ "--target=arm-linux-gnueabihf" ]
-- ldflags += [ "--target=arm-linux-gnueabihf" ]
-- }
- if (!is_nacl) {
- cflags += [
- "-march=$arm_arch",
-@@ -939,11 +934,6 @@ config("compiler_cpu_abi") {
- cflags += [ "-mtune=$arm_tune" ]
- }
- } else if (current_cpu == "arm64") {
-- if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
-- !(is_chromeos_lacros && is_chromeos_device)) {
-- cflags += [ "--target=aarch64-linux-gnu" ]
-- ldflags += [ "--target=aarch64-linux-gnu" ]
-- }
- if (is_android) {
- # Outline atomics crash on Exynos 9810. http://crbug.com/1272795
- cflags += [ "-mno-outline-atomics" ]
-@@ -955,9 +945,6 @@ config("compiler_cpu_abi") {
- if (is_android) {
- cflags += [ "--target=mipsel-linux-android" ]
- ldflags += [ "--target=mipsel-linux-android" ]
-- } else {
-- cflags += [ "--target=mipsel-linux-gnu" ]
-- ldflags += [ "--target=mipsel-linux-gnu" ]
- }
- } else {
- cflags += [ "-EL" ]
-@@ -1037,8 +1024,6 @@ config("compiler_cpu_abi") {
- ldflags += [ "-Wl,--hash-style=sysv" ]
- if (custom_toolchain == "") {
- if (is_clang) {
-- cflags += [ "--target=mips-linux-gnu" ]
-- ldflags += [ "--target=mips-linux-gnu" ]
- } else {
- cflags += [ "-EB" ]
- ldflags += [ "-EB" ]
-@@ -1086,9 +1071,6 @@ config("compiler_cpu_abi") {
- if (is_android) {
- cflags += [ "--target=mips64el-linux-android" ]
- ldflags += [ "--target=mips64el-linux-android" ]
-- } else {
-- cflags += [ "--target=mips64el-linux-gnuabi64" ]
-- ldflags += [ "--target=mips64el-linux-gnuabi64" ]
- }
- } else {
- cflags += [
-@@ -1146,8 +1128,6 @@ config("compiler_cpu_abi") {
- ldflags += [ "-Wl,--hash-style=sysv" ]
- if (custom_toolchain == "") {
- if (is_clang) {
-- cflags += [ "--target=mips64-linux-gnuabi64" ]
-- ldflags += [ "--target=mips64-linux-gnuabi64" ]
- } else {
- cflags += [
- "-EB",
-@@ -1309,23 +1289,6 @@ config("compiler_deterministic") {
- }
- }
- }
--
-- # Tells the compiler not to use absolute paths when passing the default
-- # paths to the tools it invokes. We don't want this because we don't
-- # really need it and it can mess up the goma cache entries.
-- if (is_clang && (!is_nacl || is_nacl_saigo)) {
-- cflags += [ "-no-canonical-prefixes" ]
--
-- # Same for links: Let the compiler driver invoke the linker
-- # with a relative path and pass relative paths to built-in
-- # libraries. Not needed on Windows because we call the linker
-- # directly there, not through the compiler driver.
-- # We don't link on goma, so this change is just for cleaner
-- # internal linker invocations, for people who work on the build.
-- if (!is_win) {
-- ldflags += [ "-no-canonical-prefixes" ]
-- }
-- }
- }
-
- config("clang_revision") {
---
-2.39.2
-