summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/all.gyp2
-rw-r--r--build/linux/system.gyp2
-rw-r--r--chrome/common_constants.gypi2
-rw-r--r--chrome/installer/installer_util.gypi2
-rw-r--r--net/third_party/nss/nss.gyp4
-rw-r--r--sandbox/sandbox.gyp9
-rw-r--r--skia/skia.gyp2
-rw-r--r--third_party/bzip2/bzip2.gyp2
-rw-r--r--third_party/expat/expat.gyp4
-rw-r--r--third_party/ffmpeg/ffmpeg.gyp4
-rw-r--r--third_party/libjingle/libjingle.gyp5
-rw-r--r--third_party/libjpeg/libjpeg.gyp4
-rw-r--r--third_party/libpng/libpng.gyp4
-rw-r--r--third_party/npapi/npapi.gyp2
-rw-r--r--third_party/sqlite/sqlite.gyp4
-rw-r--r--third_party/zlib/zlib.gyp6
16 files changed, 37 insertions, 21 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 5a5bac0..5cdbdb6 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -53,7 +53,7 @@
'../v8/tools/gyp/v8.gyp:*',
],
}],
- ['OS=="mac" or OS=="linux" or OS=="freebsd"', {
+ ['OS=="mac" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': [
'../third_party/yasm/yasm.gyp:*#host',
],
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 4176719..94650e9 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -13,7 +13,7 @@
'pkg-config': 'pkg-config'
},
}],
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'variables': {
# We use our own copy of libssl, although we still need to link against
# the rest of NSS.
diff --git a/chrome/common_constants.gypi b/chrome/common_constants.gypi
index e9a47c5..8c13fa1 100644
--- a/chrome/common_constants.gypi
+++ b/chrome/common_constants.gypi
@@ -63,7 +63,7 @@
'../base/base.gyp:base',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'dependencies': ['../build/linux/system.gyp:gtk'],
}],
],
diff --git a/chrome/installer/installer_util.gypi b/chrome/installer/installer_util.gypi
index 528a5bf..a6f781c 100644
--- a/chrome/installer/installer_util.gypi
+++ b/chrome/installer/installer_util.gypi
@@ -128,7 +128,7 @@
},
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'targets': [
{
'target_name': 'installer_util',
diff --git a/net/third_party/nss/nss.gyp b/net/third_party/nss/nss.gyp
index 1e7ef49..a3610f5 100644
--- a/net/third_party/nss/nss.gyp
+++ b/net/third_party/nss/nss.gyp
@@ -4,7 +4,7 @@
{
'conditions': [
- [ 'OS == "linux"', {
+ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
'conditions': [
['sysroot!=""', {
'variables': {
@@ -77,7 +77,7 @@
'NO_NSPR_10_SUPPORT',
],
'conditions': [
- [ 'OS == "linux"', {
+ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
'sources!': [
'ssl/os2_err.c',
'ssl/os2_err.h',
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index b73c1e5..5564fabc 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -126,6 +126,15 @@
],
},
'conditions': [
+ [ 'OS=="freebsd" or OS=="openbsd"', {
+ # GYP requires that each file have at least one target defined.
+ 'targets': [
+ {
+ 'target_name': 'sandbox',
+ 'type': 'settings',
+ },
+ ],
+ }],
[ 'OS=="linux" and selinux==0', {
'targets': [
{
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 1417a16..2b17094 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -693,7 +693,7 @@
'../third_party/skia/src/core',
],
'conditions': [
- [ 'OS == "linux" and target_arch != "arm"', {
+ [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd") and target_arch != "arm"', {
'cflags': [
'-msse2',
],
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index c0f36e0..27f5c84 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -5,7 +5,7 @@
{
'variables': {
'conditions': [
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# Link to system .so since we already use it due to GTK.
'use_system_bzip2%': 1,
}, { # OS!="linux"
diff --git a/third_party/expat/expat.gyp b/third_party/expat/expat.gyp
index ab017f6..2f5b9bf 100644
--- a/third_party/expat/expat.gyp
+++ b/third_party/expat/expat.gyp
@@ -15,7 +15,7 @@
]
},
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# On Linux, we implicitly already depend on expat via fontconfig;
# let's not pull it in twice.
'targets': [
@@ -59,7 +59,7 @@
'COMPILED_FROM_DSP',
],
}],
- ['OS=="mac"', {
+ ['OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
'defines': [
'HAVE_EXPAT_CONFIG_H',
],
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 3242dc8..9833911 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -756,8 +756,8 @@
],
'conditions': [
- # Non-Mac platforms need libdl for dlopen() and friends.
- ['OS!="mac"', {
+ # Linux/Solaris need libdl for dlopen() and friends.
+ ['OS=="linux" or OS=="solaris"', {
'link_settings': {
'libraries': [
'-ldl',
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 7b8b0a3..9473385 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -54,6 +54,11 @@
'POSIX',
],
}],
+ ['OS=="openbsd" or OS=="freebsd"', {
+ 'defines': [
+ 'BSD',
+ ],
+ }],
],
},
'targets': [
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp
index 1b0798b..731a61c 100644
--- a/third_party/libjpeg/libjpeg.gyp
+++ b/third_party/libjpeg/libjpeg.gyp
@@ -5,10 +5,10 @@
{
'variables': {
'conditions': [
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# Link to system .so since we already use it due to GTK.
'use_system_libjpeg%': 1,
- }, { # OS!="linux"
+ }, { # OS!="linux" and OS!="freebsd" and OS!="openbsd"
'use_system_libjpeg%': 0,
}],
],
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index d29d8c1..dbb8866 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -5,10 +5,10 @@
{
'variables': {
'conditions': [
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
# Link to system .so since we already use it due to GTK.
'use_system_libpng%': 1,
- }, { # OS!="linux"
+ }, { # OS!="linux" and OS!="freebsd" and OS!="openbsd"
'use_system_libpng%': 0,
}],
],
diff --git a/third_party/npapi/npapi.gyp b/third_party/npapi/npapi.gyp
index 643eea1..193cddd 100644
--- a/third_party/npapi/npapi.gyp
+++ b/third_party/npapi/npapi.gyp
@@ -26,7 +26,7 @@
'bindings/npruntime.h',
],
'conditions': [
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'sources': [
'bindings/npapi_x11.h',
],
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index d0cc7ec..81acf99 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -29,7 +29,7 @@
],
},
}],
- ['OS=="linux" and use_system_sqlite', {
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_sqlite', {
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
@@ -226,7 +226,7 @@
},
],
'conditions': [
- ['OS=="linux" and not use_system_sqlite', {
+ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and not use_system_sqlite', {
'targets': [
{
'target_name': 'sqlite_shell',
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 36613a7..0f77cb0 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -5,10 +5,12 @@
{
'variables': {
'conditions': [
- [ 'OS=="linux"', {
+ [ 'OS=="linux" or OS=="freebsd"', {
# Link to system .so since we already use it due to GTK.
+ # TODO(pvalchev): OpenBSD is purposefully left out, as the system
+ # zlib brings up an incompatibility that breaks rendering.
'use_system_zlib%': 1,
- }, { # OS!="linux"
+ }, { # OS!="linux" and OS!="freebsd"
'use_system_zlib%': 0,
}],
],
generated by cgit v1.1 at 2024-12-27 07:40:10 +0000