48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
|
From 58d5e21378d3fd5dd3a48adb24423c1bb9ff6f7a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Myron Sosyak <myronx.sosyak@intel.com>
|
||
|
|
Date: Thu, 27 Jan 2022 17:28:05 +0000
|
||
|
|
Subject: [PATCH 4/4] Fix Thrift 0.14.1 compatibility
|
||
|
|
|
||
|
|
---
|
||
|
|
test/saithrift/Makefile | 10 ++++------
|
||
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/test/saithrift/Makefile b/test/saithrift/Makefile
|
||
|
|
index cbe6f48..3734ee7 100644
|
||
|
|
--- a/test/saithrift/Makefile
|
||
|
|
+++ b/test/saithrift/Makefile
|
||
|
|
@@ -21,8 +21,8 @@ CDEFS = -DBRCMSAI
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
-DEPS = switch_sai_constants.h switch_sai_rpc.h switch_sai_types.h
|
||
|
|
-OBJS = switch_sai_constants.o switch_sai_rpc.o switch_sai_types.o
|
||
|
|
+DEPS = switch_sai_rpc.h switch_sai_types.h
|
||
|
|
+OBJS = switch_sai_rpc.o switch_sai_types.o
|
||
|
|
|
||
|
|
ODIR = ./src/obj
|
||
|
|
SAIDIR = ./include
|
||
|
|
@@ -42,8 +42,6 @@ endif
|
||
|
|
SAI_LIBRARY_DIR ?= $(SAI_PREFIX)/lib
|
||
|
|
LDFLAGS = -L$(SAI_LIBRARY_DIR) -Wl,-rpath=$(SAI_LIBRARY_DIR)
|
||
|
|
CPP_SOURCES = \
|
||
|
|
- src/gen-cpp/switch_sai_constants.cpp \
|
||
|
|
- src/gen-cpp/switch_sai_constants.h \
|
||
|
|
src/gen-cpp/switch_sai_rpc.cpp \
|
||
|
|
src/gen-cpp/switch_sai_rpc.h \
|
||
|
|
src/gen-cpp/switch_sai_types.cpp \
|
||
|
|
@@ -89,8 +87,8 @@ $(ODIR)/switch_sai_rpc_server.o: src/switch_sai_rpc_server.cpp
|
||
|
|
$(ODIR)/saiserver.o: src/saiserver.cpp
|
||
|
|
$(CXX) $(CFLAGS) -c $^ -o $@ $(CFLAGS) $(CDEFS) -I$(SRC)/gen-cpp -I$(SRC)
|
||
|
|
|
||
|
|
-$(ODIR)/librpcserver.a: $(ODIR)/switch_sai_rpc.o $(ODIR)/switch_sai_types.o $(ODIR)/switch_sai_constants.o $(ODIR)/switch_sai_rpc_server.o
|
||
|
|
- ar rcs $(ODIR)/librpcserver.a $(ODIR)/switch_sai_rpc.o $(ODIR)/switch_sai_types.o $(ODIR)/switch_sai_constants.o $(ODIR)/switch_sai_rpc_server.o
|
||
|
|
+$(ODIR)/librpcserver.a: $(ODIR)/switch_sai_rpc.o $(ODIR)/switch_sai_types.o $(ODIR)/switch_sai_rpc_server.o
|
||
|
|
+ ar rcs $(ODIR)/librpcserver.a $(ODIR)/switch_sai_rpc.o $(ODIR)/switch_sai_types.o $(ODIR)/switch_sai_rpc_server.o
|
||
|
|
|
||
|
|
saiserver: $(ODIR)/saiserver.o $(ODIR)/librpcserver.a
|
||
|
|
$(CXX) $(LDFLAGS) $(ODIR)/switch_sai_rpc_server.o $(ODIR)/saiserver.o -o $@ \
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|