Skip to content

Commit d7fd4ed

Browse files
authored
Allow using Boost 1.83 for dhcp4relay (#87)
Port the changes in #71 to the dhcp4relay application. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
1 parent 39e28c4 commit d7fd4ed

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dhcp4relay/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PCAPPP_DONE = $(WORKING_DIR)/pcappp.stamp
2323
INCLUDE_DIR = $(PCAPPLUSPLUS_DIR)/include
2424
LIB_DIR = $(PCAPPLUSPLUS_DIR)/lib
2525

26-
override LDLIBS += -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system $(LD_PCAPPLUSPLUS_LIB) -lpcap
26+
override LDLIBS += -levent -lhiredis -lswsscommon -pthread -lboost_thread $(LD_PCAPPLUSPLUS_LIB) -lpcap
2727
override CPPFLAGS += -Wall -std=c++17 -fPIE -I/usr/include/swss -I$(INCLUDE_DIR)
2828
override CPPFLAGS += -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)"
2929
override LDFLAGS += -L$(LIB_DIR) -Wl,-rpath=$(abspath $(LIB_DIR))

dhcp4relay/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: sonic-dhcp4relay
22
Section: devel
33
Priority: optional
44
Maintainer: Ashutosh Agrawal <ashu@cisco.com>
5-
Build-Depends: debhelper (>= 12.0.0), libevent-dev, libboost-thread-dev, libboost-system-dev, libswsscommon-dev
5+
Build-Depends: debhelper (>= 12.0.0), libevent-dev, libboost-thread-dev | libboost-thread1.83-dev, libswsscommon-dev
66
Standards-Version: 3.9.3
77
Homepage: https://github.com/Azure/sonic-buildimage
88
XS-Go-Import-Path: github.com/Azure/sonic-buildimage

0 commit comments

Comments
 (0)