Fix analytics compilation failure in ubuntu 16.04

Change-Id: Ie07529fde0b26938cfcadcad5dc1f84b958744cb Closes-Bug: #1638636
Juniper · Nov 10, 2016 · 7ef887e · 7ef887e
1 parent 44a39c2
commit 7ef887e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/analytics/SConscript b/src/analytics/SConscript
@@ -62,10 +62,8 @@ AnalyticsEnv.Prepend(LIBS=['cpuinfo',
         'boost_program_options'])
 
 (PLATFORM, VERSION, EXTRA) = platform.linux_distribution()
-if PLATFORM.lower() != 'ubuntu':
-    AnalyticsEnv.Prepend(LIBS=['ssl',
-        'crypto',
-        'sasl2'])
+if PLATFORM.lower() != 'ubuntu' or (PLATFORM.lower() == 'ubuntu' and VERSION.find('16.') == 0):
+    AnalyticsEnv.Prepend(LIBS=['ssl', 'crypto', 'sasl2'])
 
 database_libs = ['cassandra_cql', 'cassandra']
 

diff --git a/src/analytics/syslog_collector.cc b/src/analytics/syslog_collector.cc
@@ -16,7 +16,11 @@
 #include <boost/spirit/include/phoenix_core.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_stl.hpp>
+#if BOOST_VERSION >= 105600
+#include <boost/phoenix/object/construct.hpp>
+#else
 #include <boost/spirit/home/phoenix/object/construct.hpp>
+#endif
 #include <boost/uuid/uuid.hpp>
 #if __GNUC_PREREQ(4, 6)
 #pragma GCC diagnostic push

diff --git a/src/zookeeper/zookeeper_client.cc b/src/zookeeper/zookeeper_client.cc
@@ -3,6 +3,7 @@
 //
 
 #include <cerrno>
+#include <cstring>
 
 #include <base/logging.h>