-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- enable aarch64* cross build - use -fdebug-prefix-map for better ccache hits with -o debug
- Loading branch information
Showing
15 changed files
with
322 additions
and
833 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 39e6e77798d86033e5eb1fb2a2caf20a5bca2262 Mon Sep 17 00:00:00 2001 | ||
From: Stephan Hartmann <stha09@googlemail.com> | ||
Date: Sat, 9 Oct 2021 08:27:04 +0000 | ||
Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine | ||
|
||
--- | ||
base/command_line.h | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/base/command_line.h b/base/command_line.h | ||
index 706726a..ad02812 100644 | ||
--- a/base/command_line.h | ||
+++ b/base/command_line.h | ||
@@ -19,6 +19,7 @@ | ||
#include <stddef.h> | ||
#include <functional> | ||
#include <map> | ||
+#include <memory> | ||
#include <string> | ||
#include <vector> | ||
|
||
-- | ||
2.32.0 | ||
|
25 changes: 25 additions & 0 deletions
25
srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 3a7b8dd0fcceffcfd0ea7e3186d2850deed7a00b Mon Sep 17 00:00:00 2001 | ||
From: Stephan Hartmann <stha09@googlemail.com> | ||
Date: Wed, 6 Oct 2021 15:36:47 +0000 | ||
Subject: [PATCH] IWYU: add vector for std::vector in CouponDB | ||
|
||
--- | ||
chrome/browser/commerce/coupons/coupon_db.h | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h | ||
index f0758f4..93e2dd3 100644 | ||
--- a/chrome/browser/commerce/coupons/coupon_db.h | ||
+++ b/chrome/browser/commerce/coupons/coupon_db.h | ||
@@ -5,6 +5,8 @@ | ||
#ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_ | ||
#define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_ | ||
|
||
+#include <vector> | ||
+ | ||
#include "base/callback_helpers.h" | ||
#include "base/memory/weak_ptr.h" | ||
#include "url/gurl.h" | ||
-- | ||
2.32.0 | ||
|
24 changes: 24 additions & 0 deletions
24
srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
From 9e36b3c28935fb50d43ccef443be786a8e3f8a5f Mon Sep 17 00:00:00 2001 | ||
From: Stephan Hartmann <stha09@googlemail.com> | ||
Date: Sat, 9 Oct 2021 16:17:34 +0000 | ||
Subject: [PATCH] IWYU: add string.h for memcmp in ui:: DrmRenderNodePathFinder | ||
|
||
--- | ||
ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | ||
index 06776a7..d5b7b71 100644 | ||
--- a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | ||
+++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | ||
@@ -5,6 +5,7 @@ | ||
#include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h" | ||
|
||
#include <fcntl.h> | ||
+#include <string.h> | ||
#include <sys/stat.h> | ||
#include <sys/types.h> | ||
#include <unistd.h> | ||
-- | ||
2.32.0 | ||
|
31 changes: 31 additions & 0 deletions
31
srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001 | ||
From: Jose Dapena Paz <jdapena@igalia.com> | ||
Date: Fri, 08 Oct 2021 06:32:55 +0000 | ||
Subject: [PATCH] libstdc++: no implicit conversion from tuple created with std::tie to an std::pair in restricted cookie manager. | ||
|
||
Fix compilation error: | ||
../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator[]’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map<std::pair<GURL, net::SiteForCookies>, std::unique_ptr<std::set<net::CookieWithAccessResult, network::CookieWithAccessResultComparer> > >’} and ‘std::tuple<const GURL&, const net::SiteForCookies&>’) | ||
|
||
There is no conversion from tuple to pair. | ||
|
||
Bug: 957519 | ||
Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8 | ||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752 | ||
Reviewed-by: Robbie McElrath <rmcelrath@chromium.org> | ||
Commit-Queue: José Dapena Paz <jdapena@igalia.com> | ||
Cr-Commit-Position: refs/heads/main@{#929597} | ||
--- | ||
|
||
diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc | ||
index 425426f..c8c10c6 100644 | ||
--- a/services/network/restricted_cookie_manager.cc | ||
+++ b/services/network/restricted_cookie_manager.cc | ||
@@ -161,7 +161,7 @@ | ||
const GURL& url, | ||
const net::SiteForCookies& site_for_cookies) { | ||
std::unique_ptr<CookieAccesses>& entry = | ||
- recent_cookie_accesses_[std::tie(url, site_for_cookies)]; | ||
+ recent_cookie_accesses_[std::make_pair(url, site_for_cookies)]; | ||
if (!entry) { | ||
entry = std::make_unique<CookieAccesses>(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
--- a/build/config/compiler/BUILD.gn.orig | ||
+++ b/build/config/compiler/BUILD.gn | ||
@@ -58,6 +58,10 @@ | ||
} | ||
|
||
declare_args() { | ||
+ is_musl = false | ||
+} | ||
+ | ||
+declare_args() { | ||
# Normally, Android builds are lightly optimized, even for debug builds, to | ||
# keep binary size down. Setting this flag to true disables such optimization | ||
android_full_debug = false | ||
@@ -880,8 +884,13 @@ | ||
} | ||
} else if (current_cpu == "arm64") { | ||
if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | ||
- cflags += [ "--target=aarch64-linux-gnu" ] | ||
- ldflags += [ "--target=aarch64-linux-gnu" ] | ||
+ if (is_musl) { | ||
+ cflags += [ "--target=aarch64-linux-musl" ] | ||
+ ldflags += [ "--target=aarch64-linux-musl" ] | ||
+ } else { | ||
+ cflags += [ "--target=aarch64-linux-gnu" ] | ||
+ ldflags += [ "--target=aarch64-linux-gnu" ] | ||
+ } | ||
} | ||
} else if (current_cpu == "mipsel" && !is_nacl) { | ||
ldflags += [ "-Wl,--hash-style=sysv" ] | ||
--- a/build/toolchain/linux/unbundle/BUILD.gn.orig | ||
+++ b/build/toolchain/linux/unbundle/BUILD.gn | ||
@@ -39,3 +39,22 @@ | ||
current_os = host_os | ||
} | ||
} | ||
+ | ||
+gcc_toolchain("v8_snapshot_cross") { | ||
+ cc = getenv("BUILD_CC") | ||
+ cxx = getenv("BUILD_CXX") | ||
+ ar = getenv("BUILD_AR") | ||
+ nm = getenv("BUILD_NM") | ||
+ ld = cxx | ||
+ | ||
+ extra_cflags = getenv("BUILD_CFLAGS") | ||
+ extra_cppflags = getenv("BUILD_CPPFLAGS") | ||
+ extra_cxxflags = getenv("BUILD_CXXFLAGS") | ||
+ extra_ldflags = getenv("BUILD_LDFLAGS") | ||
+ | ||
+ toolchain_args = { | ||
+ current_cpu = host_cpu | ||
+ current_os = host_os | ||
+ v8_current_cpu = target_cpu | ||
+ } | ||
+} | ||
--- a/build/config/linux/pkg_config.gni.orig | ||
+++ b/build/config/linux/pkg_config.gni | ||
@@ -91,7 +91,7 @@ | ||
assert(defined(invoker.packages), | ||
"Variable |packages| must be defined to be a list in pkg_config.") | ||
config(target_name) { | ||
- if (host_toolchain == current_toolchain) { | ||
+ if (current_cpu != target_cpu) { | ||
args = host_pkg_config_args + invoker.packages | ||
} else { | ||
args = pkg_config_args + invoker.packages |
Oops, something went wrong.