summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net_BUILD.gn
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-net_BUILD.gn')
-rw-r--r--www/chromium/files/patch-net_BUILD.gn25
1 files changed, 17 insertions, 8 deletions
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 95db38d89687..99e5c28e7ab8 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,15 +1,15 @@
---- net/BUILD.gn.orig 2020-09-08 19:14:08 UTC
+--- net/BUILD.gn.orig 2020-11-13 06:36:45 UTC
+++ net/BUILD.gn
@@ -99,7 +99,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
]
--if (is_linux) {
-+if (is_linux && !is_bsd) {
+-if (is_linux || is_chromeos) {
++if ((is_linux || is_chromeos) && !is_bsd) {
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1253,6 +1253,16 @@ component("net") {
+@@ -1261,6 +1261,16 @@ component("net") {
]
}
@@ -26,7 +26,7 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1383,7 +1393,7 @@ component("net") {
+@@ -1397,7 +1407,7 @@ component("net") {
}
}
@@ -35,12 +35,21 @@
sources += [
"base/network_change_notifier_posix.cc",
"base/network_change_notifier_posix.h",
-@@ -1416,7 +1426,7 @@ component("net") {
+@@ -1430,7 +1440,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
-- if (is_posix && !is_linux) {
-+ if (is_posix && (!is_linux || is_bsd)) {
+- if (is_posix && !is_linux && !is_chromeos) {
++ if ((is_posix && !is_linux && !is_chromeos) || is_bsd) {
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
+@@ -4770,7 +4780,7 @@ test("net_unittests") {
+ }
+
+ # Use getifaddrs() on POSIX platforms, except Linux and Android.
+- if (is_posix && !is_linux && !is_chromeos && !is_android) {
++ if ((is_posix && !is_linux && !is_chromeos && !is_android) || is_bsd) {
+ sources += [ "base/network_interfaces_getifaddrs_unittest.cc" ]
+ }
+