summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net__net.gyp
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-08-26 17:09:02 +0000
committerRene Ladan <rene@FreeBSD.org>2014-08-26 17:09:02 +0000
commitb88b94b93ed0b3627f1b378dfe8487cc771fc34a (patch)
treec3ccf772a3d86897da74898d1bbad2b036954bac /www/chromium/files/patch-net__net.gyp
parentAllow the build to get much farther before it fails. Now it fails on (diff)
Update www/chromium to 37.0.2062.94
Obtained from: freebsd-chromium@ (especially Carlos Medina) MFH: 2014Q3 Security: http://www.vuxml.org/freebsd/fd5f305d-2d3d-11e4-aa3d-00262d5ed8ee.html
Notes
Notes: svn path=/head/; revision=366226
Diffstat (limited to 'www/chromium/files/patch-net__net.gyp')
-rw-r--r--www/chromium/files/patch-net__net.gyp12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp
index 4b46e9d34fdc..c88c8bc3aed0 100644
--- a/www/chromium/files/patch-net__net.gyp
+++ b/www/chromium/files/patch-net__net.gyp
@@ -1,6 +1,6 @@
---- ./net/net.gyp.orig 2014-08-12 21:02:41.000000000 +0200
-+++ ./net/net.gyp 2014-08-13 09:56:57.000000000 +0200
-@@ -277,9 +277,10 @@
+--- ./net/net.gyp.orig 2014-08-20 21:02:28.000000000 +0200
++++ ./net/net.gyp 2014-08-22 15:06:26.000000000 +0200
+@@ -317,9 +317,10 @@
}],
['os_bsd==1', {
'sources!': [
@@ -12,16 +12,16 @@
],
},{
'dependencies': [
-@@ -509,7 +510,7 @@
+@@ -551,7 +552,7 @@
'<@(net_test_sources)',
],
'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
'dependencies': [
- 'balsa',
'epoll_server',
-@@ -973,6 +974,11 @@
+ 'flip_in_mem_edsm_server_base',
+@@ -1016,6 +1017,11 @@
'dns/mock_mdns_socket_factory.h'
]
}],