The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=35dd53a9e13265f7a479649776453efc5b737a0f
commit 35dd53a9e13265f7a479649776453efc5b737a0f Author: Sumit Saxena <[email protected]> AuthorDate: 2025-12-03 11:28:33 +0000 Commit: Sumit Saxena <[email protected]> CommitDate: 2025-12-03 11:33:40 +0000 librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping By default ibv_devices and rping are not statically bound to libbnxtre.so.1. i.e. 'ldd /usr/bin/rping' command doesn't list 'libbnxtre.so.1' entry. So, statically bound the libbnxtre.so.1 library to rping & ibv_devices utils. MFC-After: 3 days Reviewed-by: [email protected] Differential-Revision: https://reviews.freebsd.org/D49604 --- share/mk/src.libnames.mk | 7 +++++-- usr.bin/ofed/libibverbs/Makefile.inc | 2 +- usr.bin/ofed/librdmacm/Makefile.inc | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index e108cc15fb55..125fe2242bd5 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -285,6 +285,7 @@ _LIBRARIES+= \ irdma \ mlx4 \ mlx5 \ + bnxtre \ rdmacm \ osmcomp \ opensm \ @@ -360,7 +361,7 @@ _DP_cap_sysctl= nv _DP_cap_syslog= nv _DP_crypt= md .if ${MK_OFED} != "no" -_DP_pcap= ibverbs mlx5 +_DP_pcap= ibverbs mlx5 bnxtre .endif _DP_pjdlog= util _DP_usb= pthread @@ -511,11 +512,12 @@ _DP_cxgb4= ibverbs pthread _DP_ibcm= ibverbs _DP_ibmad= ibumad _DP_ibnetdisc= osmcomp ibmad ibumad -_DP_ibumad= +_DP_ibumad= _DP_ibverbs= _DP_irdma= ibverbs pthread _DP_mlx4= ibverbs pthread _DP_mlx5= ibverbs pthread +_DP_bnxtre= ibverbs pthread _DP_rdmacm= ibverbs _DP_osmcomp= pthread _DP_opensm= pthread @@ -810,6 +812,7 @@ LIBIBVERBSDIR= ${_LIB_OBJTOP}/lib/ofed/libibverbs LIBIRDMADIR= ${_LIB_OBJTOP}/lib/ofed/libirdma LIBMLX4DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx4 LIBMLX5DIR= ${_LIB_OBJTOP}/lib/ofed/libmlx5 +LIBBNXTREDIR= ${_LIB_OBJTOP}/lib/ofed/libbnxtre LIBRDMACMDIR= ${_LIB_OBJTOP}/lib/ofed/librdmacm LIBOSMCOMPDIR= ${_LIB_OBJTOP}/lib/ofed/complib LIBOPENSMDIR= ${_LIB_OBJTOP}/lib/ofed/libopensm diff --git a/usr.bin/ofed/libibverbs/Makefile.inc b/usr.bin/ofed/libibverbs/Makefile.inc index 616c9bd54707..f8301c3d1073 100644 --- a/usr.bin/ofed/libibverbs/Makefile.inc +++ b/usr.bin/ofed/libibverbs/Makefile.inc @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/libibverbs BINDIR?= /usr/bin CFLAGS+= -I${_spath} -LIBADD+= ibverbs mlx4 mlx5 cxgb4 irdma pthread +LIBADD+= ibverbs mlx4 mlx5 bnxtre cxgb4 irdma pthread WARNS?= 2 diff --git a/usr.bin/ofed/librdmacm/Makefile.inc b/usr.bin/ofed/librdmacm/Makefile.inc index 74f32fe08b42..66fcf2ac267b 100644 --- a/usr.bin/ofed/librdmacm/Makefile.inc +++ b/usr.bin/ofed/librdmacm/Makefile.inc @@ -3,6 +3,6 @@ _spath=${SRCTOP}/contrib/ofed/librdmacm BINDIR?= /usr/bin CFLAGS+= -I${SRCTOP}/contrib/ofed -LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 cxgb4 pthread +LIBADD+= ibverbs rdmacm irdma mlx4 mlx5 bnxtre cxgb4 pthread WARNS?= 0
