summaryrefslogtreecommitdiffstats
path: root/third_party/libevent
diff options
context:
space:
mode:
authorpvalchev@chromium.org <pvalchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 23:10:18 +0000
committerpvalchev@chromium.org <pvalchev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 23:10:18 +0000
commitcbb50db9d9184a60265d95d7d4401eb3df8033fd (patch)
tree6461c0818dcd042d6f1742a0c03c17e2ad5a54b1 /third_party/libevent
parent5ac670a3a8c4e3e2f2b7ed3ad1190f9ed34dd512 (diff)
downloadchromium_src-cbb50db9d9184a60265d95d7d4401eb3df8033fd.zip
chromium_src-cbb50db9d9184a60265d95d7d4401eb3df8033fd.tar.gz
chromium_src-cbb50db9d9184a60265d95d7d4401eb3df8033fd.tar.bz2
I added FreeBSD-generated config files for libevent and tcmalloc, along with some remaining gyp file tweaks.
Review URL: http://codereview.chromium.org/3423021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libevent')
-rw-r--r--third_party/libevent/README.chromium5
-rw-r--r--third_party/libevent/chromium.patch4
-rw-r--r--third_party/libevent/event-config.h2
3 files changed, 8 insertions, 3 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