summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 04:19:35 +0000
committerpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-04 04:19:35 +0000
commit60b2c071b12334b8b70e65c528588fbdf310b8ca (patch)
treea9fd7a7b86c4499b3ccc79e7e77c506a73cebb07 /third_party
parentf6dc8961a5a6dae4bdd32f43d28b3c8efadb8b25 (diff)
downloadchromium_src-60b2c071b12334b8b70e65c528588fbdf310b8ca.zip
chromium_src-60b2c071b12334b8b70e65c528588fbdf310b8ca.tar.gz
chromium_src-60b2c071b12334b8b70e65c528588fbdf310b8ca.tar.bz2
OpenBSD/FreeBSD GYP changes (most of the remaining ones)
Review URL: http://codereview.chromium.org/565043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rwxr-xr-xthird_party/ffmpeg/ffmpeg.gyp16
-rw-r--r--third_party/libevent/libevent.gyp2
-rw-r--r--third_party/libjingle/libjingle.gyp6
-rw-r--r--third_party/libxml/libxml.gyp6
-rw-r--r--third_party/libxslt/libxslt.gyp4
5 files changed, 20 insertions, 14 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index a6ace12..d1a5708 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -7,7 +7,9 @@
{
'target_defaults': {
'conditions': [
- ['OS!="linux" and OS!="freebsd"', {'sources/': [['exclude', '/linux/']]}],
+ ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
+ 'sources/': [['exclude', '/linux/']]
+ }],
['OS!="mac"', {'sources/': [['exclude', '/mac/']]}],
['OS!="win"', {'sources/': [['exclude', '/win/']]}],
],
@@ -47,7 +49,7 @@
#
# TODO(ajwong): Per the comment above, reduce this conditional's size and
# determine if in-tree build in Windows is tractable.
- ['(OS!="linux" and OS!="freebsd" and OS!="mac") or use_system_ffmpeg!=0', {
+ ['(OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="mac") or use_system_ffmpeg!=0', {
'variables': {
'target_for_binaries': 'ffmpeg_binaries',
'ffmpeg_include_root': 'include',
@@ -274,7 +276,7 @@
'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c',
],
}], # target_arch=="arm" and ffmpeg_branding=="ChromeOS"
- ['OS=="linux" or OS=="freebsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'defines': [
'_ISOC99_SOURCE',
'_LARGEFILE_SOURCE',
@@ -310,7 +312,7 @@
}],
],
},
- }], # OS=="linux" or OS=="freebsd"
+ }], # OS=="linux" or OS=="freebsd" or OS=="openbsd"
['OS=="mac"', {
'libraries': [
# TODO(ajwong): Move into link_settings when this is fixed:
@@ -394,7 +396,7 @@
'rules': [
{
'conditions': [
- ['OS=="linux" or OS=="freebsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'variables': {
'obj_format': 'elf',
},
@@ -512,7 +514,7 @@
'ffmpegsumo',
],
'conditions': [
- ['OS=="linux" or OS=="freebsd"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'copies': [
{
# On Make and Scons builds, the library does not end up in
@@ -717,7 +719,7 @@
],
},
'dependencies': ['../../build/win/system.gyp:cygwin'],
- }], ['OS=="linux" or OS=="freebsd"', {
+ }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'variables': {
# TODO(ajwong): Clean this up after we've finished
# migrating to in-tree build.
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp
index 6d03930..56fa749 100644
--- a/third_party/libevent/libevent.gyp
+++ b/third_party/libevent/libevent.gyp
@@ -50,7 +50,7 @@
],
},
}],
- [ 'OS == "mac" or OS == "freebsd"', {
+ [ 'OS == "mac" or OS == "freebsd" or OS == "openbsd"', {
'sources': [ 'kqueue.c' ],
'include_dirs': [ 'mac' ]
}],
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index b600e75..1af1668 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -28,7 +28,7 @@
'FEATURE_ENABLE_VOICEMAIL',
],
'conditions': [
- ['OS=="linux" or OS=="mac"', {
+ ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
'defines': [
'POSIX',
],
@@ -41,7 +41,7 @@
'../third_party/platformsdk_win2008_6_1/files/Include',
],
}],
- ['OS=="linux" or OS=="mac"', {
+ ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
'defines': [
'POSIX',
],
@@ -272,7 +272,7 @@
'overrides/talk/base/winsock_initializer.cc',
],
}],
- ['OS=="linux" or OS=="mac"', {
+ ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
'sources': [
'files/talk/base/unixfilesystem.cc',
],
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 541f47f..1b28793 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -5,7 +5,9 @@
{
'variables': {
'conditions': [
- ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}],
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ 'os_include': 'linux'
+ }],
['OS=="mac"', {'os_include': 'mac'}],
['OS=="win"', {'os_include': 'win32'}],
],
@@ -15,7 +17,7 @@
{
'target_name': 'libxml',
'conditions': [
- ['(OS=="linux" or OS=="freebsd") and use_system_libxml', {
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_libxml', {
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp
index 1f62810..ae83817 100644
--- a/third_party/libxslt/libxslt.gyp
+++ b/third_party/libxslt/libxslt.gyp
@@ -5,7 +5,9 @@
{
'variables': {
'conditions': [
- ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}],
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ 'os_include': 'linux'
+ }],
['OS=="mac"', {'os_include': 'mac'}],
['OS=="win"', {'os_include': 'win32'}],
],