From fe94170c809773d86b196bd8d881f78ba71a1d7c Mon Sep 17 00:00:00 2001
From: Kamil Cudnik <kcudnik@gmail.com>
Date: Wed, 11 Mar 2020 20:09:40 +0100
Subject: [PATCH] [syncd] Fix RPC compilation issues (#570)

* [syncd] Fix RPC compilation issues
* Add missing rpc link for vssyncd
---
 syncd/syncd.cpp   | 7 +++++++
 tests/Makefile.am | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
index c8a90f5d6237..172029296cd2 100644
--- a/syncd/syncd.cpp
+++ b/syncd/syncd.cpp
@@ -3,9 +3,16 @@
 #include "CommandLineOptionsParser.h"
 #include "Syncd.h"
 #include "MetadataLogger.h"
+#include "PortMapParser.h"
 
 #include "swss/warm_restart.h"
 
+#ifdef SAITHRIFT
+#include <utility>
+#include <algorithm>
+#include <switch_sai_rpc_server.h>
+#endif // SAITHRIFT
+
 #ifdef SAITHRIFT
 #define SWITCH_SAI_THRIFT_RPC_SERVER_PORT 9092
 #endif // SAITHRIFT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 39c5e3ea345f..8ee622e3622a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,4 +15,8 @@ vssyncd_SOURCES = ../syncd/main.cpp
 vssyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS)
 vssyncd_LDADD = -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl ../syncd/libsyncd.a
 
+if SAITHRIFT
+vssyncd_LDADD += -lrpcserver -lthrift
+endif
+
 TESTS = aspellcheck.pl conflictnames.pl swsslogentercheck.sh brcm.pl mlnx.pl