From 651302b592fe54c5197641402df87ff216c27903 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Thu, 23 Jul 2020 16:31:18 +0000 Subject: www/iridium: update to 2020.04.81 PR: 245959 Submitted by: Matthias Wolf MFH: 2020Q3 Security: any Chromium vulnerability between 73 and 81 --- www/iridium/files/patch-tools_gn_build_gen.py | 29 +++++++++------------------ 1 file changed, 10 insertions(+), 19 deletions(-) (limited to 'www/iridium/files/patch-tools_gn_build_gen.py') diff --git a/www/iridium/files/patch-tools_gn_build_gen.py b/www/iridium/files/patch-tools_gn_build_gen.py index c133a516bb05..1461138a4fd5 100644 --- a/www/iridium/files/patch-tools_gn_build_gen.py +++ b/www/iridium/files/patch-tools_gn_build_gen.py @@ -1,33 +1,24 @@ ---- tools/gn/build/gen.py.orig 2019-03-11 22:12:13 UTC +--- tools/gn/build/gen.py.orig 2020-03-16 18:48:21 UTC +++ tools/gn/build/gen.py -@@ -44,7 +44,7 @@ class Platform(object): - - @staticmethod - def known_platforms(): -- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia'] -+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd'] - - def platform(self): - return self._platform -@@ -67,6 +67,9 @@ class Platform(object): - def is_aix(self): - return self._platform == 'aix' +@@ -73,6 +73,9 @@ class Platform(object): + def is_haiku(self): + return self._platform == 'haiku' + def is_freebsd(self): + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku'] -@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options): - elif platform.is_aix(): - cflags_cc.append('-maix64') - ldflags.append('-maix64') +@@ -351,6 +354,11 @@ def WriteGNNinja(path, platform, host, options): + elif platform.is_haiku(): + cflags.append('-fPIC') + cflags.extend(['-D_BSD_SOURCE']) + elif platform.is_freebsd(): + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) + ldflags.extend(['-pthread']) + libs.extend(['-lexecinfo', '-lkvm', '-lutil']) + include_dirs += ['/usr/local/include'] - if platform.is_posix(): + if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') -- cgit v1.2.3