From: Wenxian Li <wenxianl@cisco.com>
Date: Tue, 8 Sep 2015 22:41:17 +0000 (-0400)
Subject: Merge remote-tracking branch
X-Git-Tag: v1.77~5^2~2
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=60e901aabaeab7d205da65030849056c05c8b73e;p=trex.git

Merge remote-tracking branch

Conflicts:
	linux/b
	linux/ws_main.py
	linux_dpdk/ws_main.py
	src/bp_sim.h
---

60e901aabaeab7d205da65030849056c05c8b73e
diff --cc linux/ws_main.py
index 44ec9568,5bf9a743..16233485
--- a/linux/ws_main.py
+++ b/linux/ws_main.py
@@@ -22,9 -12,8 +12,7 @@@ import os
  import commands;
  import shutil;
  import copy;
 -from distutils.version import StrictVersion
  
- 
- # these variables are mandatory ('/' are converted automatically)
  top = '../'
  out = 'build'
  b_path ="./build/linux/"
@@@ -477,12 -374,16 +373,16 @@@ build_types = 
  
  
  def build_prog (bld, build_obj):
+     zmq_lib_path='external_libs/zmq/'
+     bld.read_shlib( name='zmq' , paths=[top + zmq_lib_path] )
+ 
      bld.program(features='cxx cxxprogram', 
                  includes =includes_path,
 -                cxxflags =build_obj.get_flags(),
 +                cxxflags =(build_obj.get_flags()+['-std=gnu++11',]),
-                 stlib = 'stdc++',
                  linkflags = build_obj.get_link_flags(),
-                 source = bp.file_list(top),
+                 source = build_obj.get_src(),
+                 use = build_obj.get_use_libs(),
+                 rpath  = bld.env.RPATH + build_obj.get_rpath(),
                  target = build_obj.get_target())
  
  
diff --cc src/bp_sim.h
index 6fb638e0,7d659d1c..804c936a
--- a/src/bp_sim.h
+++ b/src/bp_sim.h
@@@ -1247,8 -1249,7 +1247,9 @@@ struct CFlowYamlInfo 
      CFlowYamlInfo(){
          m_dpPkt=0;
          m_server_addr=0;
 +        m_client_pool_idx = 0;
 +        m_server_pool_idx = 0;
+         m_cap_mode=false;
      }
      
      std::string     m_name;