diff options
| -rw-r--r-- | base/base.gyp | 2 | ||||
| -rw-r--r-- | content/content_browser.gypi | 2 | ||||
| -rw-r--r-- | content/content_plugin.gypi | 2 | ||||
| -rw-r--r-- | crypto/crypto.gyp | 2 | ||||
| -rw-r--r-- | net/base/host_resolver_impl.cc | 4 | ||||
| -rw-r--r-- | net/net.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_internal.gyp | 4 | ||||
| -rw-r--r-- | ppapi/ppapi_tests.gypi | 2 | ||||
| -rw-r--r-- | printing/printing.gyp | 2 | ||||
| -rw-r--r-- | sdch/sdch.gyp | 2 | ||||
| -rw-r--r-- | third_party/expat/expat.gyp | 2 | ||||
| -rw-r--r-- | third_party/iccjpeg/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/iccjpeg/iccjpeg.gyp | 2 | ||||
| -rw-r--r-- | third_party/libevent/libevent.gyp | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 4 | ||||
| -rw-r--r-- | ui/ui.gyp | 2 |
16 files changed, 20 insertions, 18 deletions
diff --git a/base/base.gyp b/base/base.gyp index 0259c80..a45ac6d 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -365,7 +365,7 @@ 'test/scoped_locale.h', ], }], - ['OS=="openbsd"', { + ['os_bsd==1', { 'sources!': [ 'test/test_file_util_linux.cc', ], diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 4bba9f3..64b0a15 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -711,7 +711,7 @@ 'browser/renderer_host/gtk_key_bindings_handler.h', ], }], - ['OS=="openbsd"', { + ['os_bsd==1', { 'sources/': [ ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'], ], diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi index 734c497..cab0b48 100644 --- a/content/content_plugin.gypi +++ b/content/content_plugin.gypi @@ -34,7 +34,7 @@ # These are layered in conditionals in the event other platforms # end up using this module as well. 'conditions': [ - ['OS=="openbsd"', { + ['os_bsd==1', { 'sources/': [ ['exclude', '^plugin/plugin_main_linux\\.cc$'], ], diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 2b3ec73..1461b95 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -52,7 +52,7 @@ ['exclude', 'ec_private_key_nss\.cc$'], ], }], - [ 'OS == "freebsd" or OS == "openbsd"', { + [ 'os_bsd==1', { 'link_settings': { 'libraries': [ '-L/usr/local/lib -lexecinfo', diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index 334695c..217f1e1 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -84,9 +84,11 @@ std::vector<int> GetAllGetAddrinfoOSErrors() { #if defined(OS_POSIX) #if !defined(OS_FREEBSD) #if !defined(OS_ANDROID) - // EAI_ADDRFAMILY has been declared obsolete in Android's netdb.h. + // EAI_ADDRFAMILY has been declared obsolete in Android's and + // FreeBSD's netdb.h. EAI_ADDRFAMILY, #endif + // EAI_NODATA has been declared obsolete in FreeBSD's netdb.h. EAI_NODATA, #endif EAI_AGAIN, diff --git a/net/net.gyp b/net/net.gyp index e84ea03d..17f0b9a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -846,7 +846,7 @@ '../build/linux/system.gyp:ssl', ], }], - ['OS=="openbsd"', { + ['os_bsd==1', { 'sources!': [ 'base/network_change_notifier_linux.cc', 'base/network_change_notifier_netlink_linux.cc', diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 3ee98fc..1a9b476 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -13,7 +13,7 @@ # TODO(ajwong): For internal pepper plugins, which are statically linked # into chrome, do we want to build w/o -fPIC? If so, how can we express # that in the build system? - ['OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris"', { + ['os_posix==1 and OS!="android" and OS!="mac"', { 'cflags': ['-fPIC', '-fvisibility=hidden'], # This is needed to make the Linux shlib build happy. Without this, diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index 912afb3..acc1870 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -242,7 +242,7 @@ 'direct_dependent_settings': { 'product_name': '>(_target_name)', 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="android"', { + ['os_posix==1 and OS!="mac"', { 'cflags': ['-fvisibility=hidden'], 'type': 'shared_library', # -gstabs, used in the official builds, causes an ICE. Simply remove diff --git a/printing/printing.gyp b/printing/printing.gyp index 495fc73..b5eb0e4 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -261,7 +261,7 @@ ], }, }], - [ 'OS == "openbsd"', { + [ 'os_bsd==1', { 'cflags': [ '<!@(python cups_config_helper.py --cflags)', ], diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp index 82e65a1..410629f 100644 --- a/sdch/sdch.gyp +++ b/sdch/sdch.gyp @@ -54,7 +54,7 @@ }, 'conditions': [ [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ], - [ 'OS == "freebsd" or OS == "openbsd" or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], + [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ], ], diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp index f5498d0..5f9d191 100644 --- a/third_party/expat/expat.gyp +++ b/third_party/expat/expat.gyp @@ -59,7 +59,7 @@ 'COMPILED_FROM_DSP', ], }], - ['OS=="mac" or OS=="android" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="mac" or OS=="android" or os_bsd==1', { 'defines': [ 'HAVE_EXPAT_CONFIG_H', ], diff --git a/third_party/iccjpeg/README.chromium b/third_party/iccjpeg/README.chromium index ca4fe95..4b72c55 100644 --- a/third_party/iccjpeg/README.chromium +++ b/third_party/iccjpeg/README.chromium @@ -13,6 +13,6 @@ in the file LICENSE. Documentation for ICC profile can be found at: http://www.color.org Local Modifications: -* On at least OpenBSD we might need to include to correct header file from +* On BSD platforms we might need to include to correct header file from the system, so a USE_SYSTEM_LIBJPEG ifdef is added to iccjpeg.h in order to be able to decide which jpeglib.h header to include. diff --git a/third_party/iccjpeg/iccjpeg.gyp b/third_party/iccjpeg/iccjpeg.gyp index beab243..25d25ed 100644 --- a/third_party/iccjpeg/iccjpeg.gyp +++ b/third_party/iccjpeg/iccjpeg.gyp @@ -15,7 +15,7 @@ 'iccjpeg.h', ], 'conditions': [ - ['OS=="openbsd" and use_system_libjpeg==1', { + ['os_bsd==1 and use_system_libjpeg==1', { 'include_dirs': [ '/usr/local/include', ], diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index 5341a55..3a036dc 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -54,7 +54,7 @@ 'sources': [ 'epoll.c' ], 'include_dirs': [ 'android' ], }], - [ 'OS == "mac" or OS == "freebsd" or OS == "openbsd"', { + [ 'OS == "mac" or os_bsd==1', { 'sources': [ 'kqueue.c' ], 'include_dirs': [ 'mac' ] }], diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index e2e1744..5b2e764 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -89,7 +89,7 @@ 'POSIX', ], }], - ['OS=="openbsd" or OS=="freebsd"', { + ['os_bsd==1', { 'defines': [ 'BSD', ], @@ -133,7 +133,7 @@ 'POSIX', ], }], - ['OS=="openbsd" or OS=="freebsd"', { + ['os_bsd==1', { 'defines': [ 'BSD', ], @@ -590,7 +590,7 @@ '-ldl', ], }], - ['OS=="openbsd" and use_system_libjpeg==1', { + ['os_bsd==1 and use_system_libjpeg==1', { 'include_dirs': [ '/usr/local/include', ], |