[mesos] branch master updated: Added missing python egg build extensions for libevent.

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tillt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 983607e  Added missing python egg build extensions for libevent.
983607e is described below

commit 983607e5b814fd6395cc08c7002a132adf4c6bbf
Author: Till Toenshoff <to...@me.com>
AuthorDate: Thu Sep 27 00:20:17 2018 +0200

    Added missing python egg build extensions for libevent.
    
    Review: https://reviews.apache.org/r/68856/
---
 src/python/native_common/ext_modules.py.in | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/python/native_common/ext_modules.py.in b/src/python/native_common/ext_modules.py.in
index 7efbb8e..df10b5c 100644
--- a/src/python/native_common/ext_modules.py.in
+++ b/src/python/native_common/ext_modules.py.in
@@ -114,7 +114,25 @@ def _create_module(module_name):
             EXTRA_OBJECTS.append(libev)
         else:
             EXTRA_OBJECTS.append('-lev')
-
+    else:
+        libevent_dir = os.path.join('3rdparty', 'libevent-2.0.22-stable')
+        libevent_dir = os.path.join(abs_top_builddir, libevent_dir, '.libs')
+
+        libevent = os.path.join(libevent_dir, 'libevent.a')
+
+        # Check if a bundled version of libevent was built.
+        if os.path.exists(libevent):
+            EXTRA_OBJECTS.append(libevent)
+            EXTRA_OBJECTS.append(os.path.join(libevent_dir, 'libevent_extra.a'))
+            EXTRA_OBJECTS.append(os.path.join(libevent_dir, 'libevent_pthreads.a'))
+            if '@ENABLE_SSL_TRUE@' == '':
+                EXTRA_OBJECTS.append(os.path.join(libevent_dir, 'libevent_openssl.a'))
+        else:
+            EXTRA_OBJECTS.append('-levent')
+            EXTRA_OBJECTS.append('-levent_extra')
+            EXTRA_OBJECTS.append('-levent_pthreads')
+            if '@ENABLE_SSL_TRUE@' == '':
+                EXTRA_OBJECTS.append(-levent_openssl)
 
     # For gperftools, we need to check for the presence of libprofiler.a, since
     # it is possible to disable perftools inside libprocess.