diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2020-08-23 17:15:35 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2020-08-23 18:10:05 -0700 |
| commit | e8dada8eff0b36a98b514af6adc039d2920a2109 (patch) | |
| tree | 4afe7a19db71a0ab714faac45ced87a457c36c77 /ipc/chromium | |
| parent | aaeaf52308b698084c978636b4f56f87d0603f49 (diff) | |
| download | UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.gz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.lz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.tar.xz UXP-e8dada8eff0b36a98b514af6adc039d2920a2109.zip | |
Dick, YOU'RE FIRED!
Revert "Issue #1342 - Remove support for system libevent"
This reverts commit 90c5288fef22004d6e4d441b3ae10b9cd1836103.
Diffstat (limited to 'ipc/chromium')
| -rw-r--r-- | ipc/chromium/moz.build | 6 | ||||
| -rw-r--r-- | ipc/chromium/src/third_party/libeventcommon.mozbuild | 2 | ||||
| -rw-r--r-- | ipc/chromium/src/third_party/moz.build | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index b386134f9..dc5b4dca4 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -58,7 +58,7 @@ if os_win: 'src/chrome/common/process_watcher_win.cc', 'src/chrome/common/transport_dib_win.cc', ] -else: +elif not CONFIG['MOZ_SYSTEM_LIBEVENT']: DIRS += ['src/third_party'] if os_posix: @@ -143,9 +143,9 @@ if os_solaris: 'src/base/atomicops_internals_x86_gcc.cc', 'src/base/process_util_linux.cc', 'src/base/time_posix.cc', - ] +] -else: +elif not CONFIG['MOZ_SYSTEM_LIBEVENT']: LOCAL_INCLUDES += ['src/third_party/libevent/linux'] ost = CONFIG['OS_TEST'] diff --git a/ipc/chromium/src/third_party/libeventcommon.mozbuild b/ipc/chromium/src/third_party/libeventcommon.mozbuild index 33482c661..2b45ecb19 100644 --- a/ipc/chromium/src/third_party/libeventcommon.mozbuild +++ b/ipc/chromium/src/third_party/libeventcommon.mozbuild @@ -32,7 +32,7 @@ else: else: libevent_include_suffix = 'linux' -if os_posix: +if os_posix and not CONFIG['MOZ_SYSTEM_LIBEVENT']: DEFINES['HAVE_CONFIG_H'] = True LOCAL_INCLUDES += sorted([ 'libevent', diff --git a/ipc/chromium/src/third_party/moz.build b/ipc/chromium/src/third_party/moz.build index 20a5043fb..2b99e53b3 100644 --- a/ipc/chromium/src/third_party/moz.build +++ b/ipc/chromium/src/third_party/moz.build @@ -10,6 +10,9 @@ include(libevent_path_prefix + '/libeventcommon.mozbuild') if os_win: error('should not reach here on Windows') +if CONFIG['MOZ_SYSTEM_LIBEVENT']: + error('should not reach here if we are using a native libevent') + UNIFIED_SOURCES += [ 'libevent/buffer.c', 'libevent/bufferevent.c', |