From 9db3eed934f5ddc3c7a9ad4b831c78b3e789637e Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Fri, 20 Jul 2018 23:49:57 +0000 Subject: [PATCH] Move OFED libraries libmlx5.so.1 and libibverbs.so.1 to /lib. The is required because libpcap.so depends on the libraries when OFED is enabled. Reviewed by: bdrewery, hselasky Sponsored by: Mellanox Technologies MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D16230 --- ObsoleteFiles.inc | 3 +++ lib/ofed/libibverbs/Makefile | 2 +- lib/ofed/libmlx5/Makefile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 589ee7f76fe..a169318bb4e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20180721: move of libmlx5.so.1 and libibverbs.so.1 +OLD_LIBS+=usr/lib/libmlx5.so.1 +OLD_LIBS+=usr/lib/libibverbs.so.1 # 20180710: old numa cleanup OLD_FILES+=usr/include/sys/numa.h OLD_FILES+=usr/share/man/man2/numa_getaffinity.2.gz diff --git a/lib/ofed/libibverbs/Makefile b/lib/ofed/libibverbs/Makefile index eb50be2f4ff..bf41ddfb6a3 100644 --- a/lib/ofed/libibverbs/Makefile +++ b/lib/ofed/libibverbs/Makefile @@ -5,7 +5,7 @@ _spath= ${SRCTOP}/contrib/ofed/libibverbs LIB= ibverbs SHLIB_MAJOR= 1 -SHLIBDIR?= /usr/lib +SHLIBDIR?= /lib MK_PROFILE= no VERSION_MAP= ${_spath}/libibverbs.map diff --git a/lib/ofed/libmlx5/Makefile b/lib/ofed/libmlx5/Makefile index 5d31f1428ca..8cae554f47f 100644 --- a/lib/ofed/libmlx5/Makefile +++ b/lib/ofed/libmlx5/Makefile @@ -3,7 +3,7 @@ _spath= ${SRCTOP}/contrib/ofed/libmlx5 .PATH: ${_spath} -SHLIBDIR?= /usr/lib +SHLIBDIR?= /lib LIB= mlx5 SHLIB_MAJOR= 1 MK_PROFILE= no