summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-tools_gn_build_gen.py
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2019-02-24 10:52:51 +0000
committerRene Ladan <rene@FreeBSD.org>2019-02-24 10:52:51 +0000
commita31400d152016c35271aa6f676744c02865e6bf4 (patch)
tree97fd2c7c3e5f479435a4e0f4f48d23817386d0be /www/chromium/files/patch-tools_gn_build_gen.py
parentgraphics/wxsvg (diff)
www/chromium: update to 72.0.3626.119 [1]
PR: 234773 Submitted by: cpm [1], Matthias Wolf [1] Obtained from: https://github.com/cpu82/freebsd-chromium.git MFH: 2019Q1
Diffstat (limited to 'www/chromium/files/patch-tools_gn_build_gen.py')
-rw-r--r--www/chromium/files/patch-tools_gn_build_gen.py47
1 files changed, 15 insertions, 32 deletions
diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py
index 2c2bfaa99f9d..30de95b46836 100644
--- a/www/chromium/files/patch-tools_gn_build_gen.py
+++ b/www/chromium/files/patch-tools_gn_build_gen.py
@@ -1,50 +1,33 @@
---- tools/gn/build/gen.py.orig 2018-12-12 23:06:54.000000000 +0100
-+++ tools/gn/build/gen.py 2018-12-15 23:20:32.529540000 +0100
-@@ -39,10 +39,12 @@
- self._platform = 'aix'
- elif self._platform.startswith('fuchsia'):
- self._platform = 'fuchsia'
-+ elif self._platform.lower().startswith('freebsd'):
-+ self._platform = 'bsd'
+--- tools/gn/build/gen.py.orig 2019-02-06 23:16:22.000000000 +0100
++++ tools/gn/build/gen.py 2019-02-08 18:27:37.227094000 +0100
+@@ -44,7 +44,7 @@
@staticmethod
def known_platforms():
- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia']
-+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'bsd']
++ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd']
def platform(self):
return self._platform
-@@ -65,8 +67,11 @@
+@@ -67,6 +67,9 @@
def is_aix(self):
return self._platform == 'aix'
-+ def is_bsd(self):
-+ return self._platform == 'bsd'
++ def is_freebsd(self):
++ return self._platform == 'freebsd'
+
def is_posix(self):
-- return self._platform in ['linux', 'darwin', 'aix']
-+ return self._platform in ['linux', 'darwin', 'aix', 'bsd']
+ return self._platform in ['linux', 'freebsd', 'darwin', 'aix']
-
- def main(argv):
-@@ -168,6 +173,7 @@
- 'darwin': 'build_mac.ninja.template',
- 'linux': 'build_linux.ninja.template',
- 'aix': 'build_aix.ninja.template',
-+ 'bsd': 'build_linux.ninja.template'
- }[platform.platform()])
-
- with open(template_filename) as f:
-@@ -327,7 +333,11 @@
+@@ -332,6 +335,11 @@
elif platform.is_aix():
cflags_cc.append('-maix64')
- ldflags.extend(['-maix64', '-pthread'])
--
-+ elif platform.is_bsd():
+ ldflags.append('-maix64')
++ elif platform.is_freebsd():
+ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality'])
+ ldflags.extend(['-pthread'])
-+ libs.extend(['-lexecinfo', '-lkvm'])
++ libs.extend(['-lexecinfo', '-lkvm', '-lutil'])
+ include_dirs += ['/usr/local/include']
- if options.use_lto:
- cflags.extend(['-flto', '-fwhole-program-vtables'])
- ldflags.extend(['-flto', '-fwhole-program-vtables'])
+
+ if platform.is_posix():
+ ldflags.append('-pthread')