diff options
| -rw-r--r-- | third_party/libevent/README.chromium | 5 | ||||
| -rw-r--r-- | third_party/libevent/chromium.patch | 4 | ||||
| -rw-r--r-- | third_party/libevent/event-config.h | 2 | ||||
| -rw-r--r-- | third_party/libxml/libxml.gyp | 3 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt.gyp | 3 | ||||
| -rw-r--r-- | third_party/mesa/mesa.gyp | 2 | ||||
| -rw-r--r-- | third_party/tcmalloc/chromium/src/config.h | 2 |
7 files changed, 15 insertions, 6 deletions
diff --git a/third_party/libevent/README.chromium b/third_party/libevent/README.chromium index 1cd6437..c9002be 100644 --- a/third_party/libevent/README.chromium +++ b/third_party/libevent/README.chromium @@ -7,8 +7,9 @@ Local Modifications: Rather than use libevent's own build system, we just build a Chrome static library using GYP. -1) Run configure and "make event-config.h" on a Linux and Mac box and - copy config.h and event-config.h to linux/ and mac/ respectively. +1) Run configure and "make event-config.h" on a Linux, FreeBSD, and + Mac box and copy config.h and event-config.h to linux/, freebsd/, + and mac/ respectively. 2) Add libevent.gyp. 3) chromium.patch is applied to allow libevent to be used without being installed. diff --git a/third_party/libevent/chromium.patch b/third_party/libevent/chromium.patch index 9685e6b..04a73b0 100644 --- a/third_party/libevent/chromium.patch +++ b/third_party/libevent/chromium.patch @@ -3,7 +3,7 @@ new file mode 100644 index 0000000..78a4727 --- /dev/null +++ b/third_party/libevent/event-config.h -@@ -0,0 +1,14 @@ +@@ -0,0 +1,16 @@ +// Copyright (c) 2009 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. @@ -15,6 +15,8 @@ index 0000000..78a4727 +#include "mac/event-config.h" +#elif defined(__linux__) +#include "linux/event-config.h" ++#elif defined(__FreeBSD__) ++#include "freebsd/event-config.h" +#else +#error generate event-config.h for your platform +#endif diff --git a/third_party/libevent/event-config.h b/third_party/libevent/event-config.h index 66a53de..d3b8486 100644 --- a/third_party/libevent/event-config.h +++ b/third_party/libevent/event-config.h @@ -9,6 +9,8 @@ #include "mac/event-config.h" #elif defined(__linux__) #include "linux/event-config.h" +#elif defined(__FreeBSD__) +#include "freebsd/event-config.h" #else #error generate event-config.h for your platform #endif diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 8d205f1..6371628 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -19,7 +19,8 @@ { 'target_name': 'libxml', 'conditions': [ - ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_system_libxml', { + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") ' + '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 cc6a377..f18f810 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -21,7 +21,8 @@ { 'target_name': 'libxslt', 'conditions': [ - ['OS=="linux" and use_system_libxml', { + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") ' + 'and use_system_libxml', { 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 277add5..e720f8f 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -7,7 +7,7 @@ }, 'target_defaults': { 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'cflags': [ '-fPIC', ], diff --git a/third_party/tcmalloc/chromium/src/config.h b/third_party/tcmalloc/chromium/src/config.h index 812c67c..047b878 100644 --- a/third_party/tcmalloc/chromium/src/config.h +++ b/third_party/tcmalloc/chromium/src/config.h @@ -15,6 +15,8 @@ #include "third_party/tcmalloc/chromium/src/config_win.h" #elif defined(OS_LINUX) #include "third_party/tcmalloc/chromium/src/config_linux.h" +#elif defined(OS_FREEBSD) +#include "third_party/tcmalloc/chromium/src/config_freebsd.h" #endif #endif // CONFIG_H_ |