diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 20:23:54 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 20:23:54 +0000 |
| commit | 78d4429cef4baac9bcdfc2396ce157016621c416 (patch) | |
| tree | ca8e34515c63dd682d9b75b9bfc6113fcb0c2dfd /third_party/libevent/libevent.gyp | |
| parent | 9101b6b1b3de0a1e3c59325055707c58748651af (diff) | |
| download | chromium_src-78d4429cef4baac9bcdfc2396ce157016621c416.zip chromium_src-78d4429cef4baac9bcdfc2396ce157016621c416.tar.gz chromium_src-78d4429cef4baac9bcdfc2396ce157016621c416.tar.bz2 | |
posix: upgrade libevent from 1.4.7 to 1.4.13
I took this opportunity to rejigger how we hacked around using an uninstalled
libevent, to remove a TODO that mentioned danger in the README.
Files to review: README.chromium and chromium.patch.
The rest are probably rubber-stampable.
Review URL: http://codereview.chromium.org/412006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libevent/libevent.gyp')
| -rw-r--r-- | third_party/libevent/libevent.gyp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/third_party/libevent/libevent.gyp b/third_party/libevent/libevent.gyp index 1e2ce20..20ac4d64 100644 --- a/third_party/libevent/libevent.gyp +++ b/third_party/libevent/libevent.gyp @@ -37,17 +37,18 @@ [ 'OS == "linux"', { 'sources': [ 'epoll.c', 'epoll_sub.c' ], 'include_dirs': [ 'linux' ], - 'link_settings': - { 'libraries': [ + 'link_settings': { + 'libraries': [ # We need rt for clock_gettime(). # TODO(port) Maybe on FreeBSD as well? '-lrt', - ], - }, - } - ], - [ 'OS == "mac" or OS == "freebsd"', { 'sources': [ 'kqueue.c' ], - 'include_dirs': [ 'mac' ] } ], + ], + }, + }], + [ 'OS == "mac" or OS == "freebsd"', { + 'sources': [ 'kqueue.c' ], + 'include_dirs': [ 'mac' ] + }], ], }, ], |