From d811a098cc04289f8c4ab4bfa6449d7861621d38 Mon Sep 17 00:00:00 2001
From: Megh Bhatt <meghb@juniper.net>
Date: Wed, 11 May 2016 17:15:45 -0700
Subject: [PATCH] Include libcpuinfo with -whole-archive link flags

libcpuinfo contains task.sandesh generated files and so needs to be
included with link flags -whole-archive so that task.xml shows
up in the HTTP introspect page.

Change-Id: I623cbdc7d02ad5a6a3475aa90b300e146915af25
Closes-Bug: #1557182
---
 src/analytics/SConscript    | 1 +
 src/dns/SConscript          | 2 +-
 src/query_engine/SConscript | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/analytics/SConscript b/src/analytics/SConscript
index f1cf1229912..033f54311fb 100644
--- a/src/analytics/SConscript
+++ b/src/analytics/SConscript
@@ -123,6 +123,7 @@ if sys.platform != 'darwin':
     buildinfo_dep_libs += [ '../../lib/libtbb_debug.so.2' ]
     AnalyticsEnv.Prepend(LINKFLAGS =
                          ['-Wl,--whole-archive',
+                          '-lcpuinfo',
                           '-l:librdkafka.a', '-l:librdkafka++.a',
                           '-Wl,--no-whole-archive'])
 
diff --git a/src/dns/SConscript b/src/dns/SConscript
index d73f4638968..b96f2ffb19f 100644
--- a/src/dns/SConscript
+++ b/src/dns/SConscript
@@ -41,7 +41,7 @@ env.Append(LIBPATH=libs)
 if sys.platform != 'darwin':
     env.Prepend(LINKFLAGS =
                      ['-Wl,--whole-archive',
-                      '-lifmap_server', '-rdynamic',
+                      '-lcpuinfo', '-lifmap_server', '-rdynamic',
                       '-Wl,--no-whole-archive'])
 
 contrail_dns = env.Program(target = 'contrail-dns', source = ['main.cc'])
diff --git a/src/query_engine/SConscript b/src/query_engine/SConscript
index f9825209c72..39ce378e925 100644
--- a/src/query_engine/SConscript
+++ b/src/query_engine/SConscript
@@ -133,6 +133,15 @@ env.GenerateBuildInfoCode(
 
 build_obj = map(lambda x : env.Object(x), ['buildinfo.cc'])
 
+lib_cpuinfo = File('../base/libcpuinfo.a')
+if sys.platform != 'darwin':
+    env.Prepend(LINKFLAGS =
+                  ['-Wl,--whole-archive',
+                   '-lcpuinfo',
+                   '-Wl,--no-whole-archive'])
+else:
+    env.Prepend(LINKFLAGS = ['-Wl,-force_load,' + lib_cpuinfo.path])
+
 qed = env.Program(
         target = 'qed', 
         source = qed_objs + qed_except_objs + build_obj +