Skip to content

Commit

Permalink
Static linking rdkafka library with collector.
Browse files Browse the repository at this point in the history
The new (0.8) and old (0.9) versions of librdkafka1 and librdkafka-dev are incompatible with each other
Using a static library make upgrade easier; no need to coordinate upgrade of those two packages

Partial-Bug: 1513055

Conflicts:
	src/analytics/SConscript

Change-Id: I404d33f71dda08722d8fce53a5026e51eb48beea
  • Loading branch information
anishmehta committed Feb 23, 2016
1 parent dd168bb commit 75df400
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/analytics/SConscript
Expand Up @@ -46,15 +46,14 @@ AnalyticsEnv.Prepend(LIBS=['cpuinfo',
'process_info',
'base',
'io',
'z',
'net',
'ipfix',
'misc',
'sandeshvns',
'pugixml',
'hiredis',
'protobuf',
'rdkafka++',
'rdkafka',
'boost_filesystem',
'boost_program_options'])

Expand Down Expand Up @@ -115,7 +114,10 @@ buildinfo_dep_libs = ['../base/libcpuinfo.a', '../../lib/libsandesh.a', '../../l

if sys.platform != 'darwin':
buildinfo_dep_libs += [ '../../lib/libtbb_debug.so.2' ]

AnalyticsEnv.Prepend(LINKFLAGS =
['-Wl,--whole-archive',
'-l:librdkafka.a', '-l:librdkafka++.a',
'-Wl,--no-whole-archive'])

def RedisLuaBuild(env, scr_name):
env.Command('%s_lua.cpp' % scr_name ,'%s.lua' % scr_name,\
Expand Down

0 comments on commit 75df400

Please sign in to comment.