diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.libnames.mk | 7 | ||||
| -rw-r--r-- | share/mk/src.libnames.mk | 56 |
2 files changed, 36 insertions, 27 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 07e7a4c..e09b2a6 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -95,6 +95,11 @@ LIBKICONV?= ${DESTDIR}${LIBDIR_BASE}/libkiconv.a LIBKRB5?= ${DESTDIR}${LIBDIR_BASE}/libkrb5.a LIBKVM?= ${DESTDIR}${LIBDIR_BASE}/libkvm.a LIBL?= ${DESTDIR}${LIBDIR_BASE}/libl.a +LIBIBCM?= ${DESTDIR}${LIBDIR_BASE}/libibcm.a +LIBIBMAD?= ${DESTDIR}${LIBDIR_BASE}/libibmad.a +LIBIBNETDISC?= ${LIBDESTDIR}${LIBDIR_BASE}/libibnetdisc. +LIBIBUMAD?= ${DESTDIR}${LIBDIR_BASE}/libibumad.a +LIBIBVERBS?= ${DESTDIR}${LIBDIR_BASE}/libibverbs.a LIBLN?= "don't use LIBLN, use LIBL" LIBLZMA?= ${DESTDIR}${LIBDIR_BASE}/liblzma.a LIBM?= ${DESTDIR}${LIBDIR_BASE}/libm.a @@ -104,9 +109,9 @@ LIBMEMSTAT?= ${DESTDIR}${LIBDIR_BASE}/libmemstat.a LIBMENU?= ${DESTDIR}${LIBDIR_BASE}/libmenu.a LIBMILTER?= ${DESTDIR}${LIBDIR_BASE}/libmilter.a LIBMLX4?= ${DESTDIR}${LIBDIR_BASE}/libmlx4.a +LIBMLX5?= ${DESTDIR}${LIBDIR_BASE}/libmlx5.a LIBMP?= ${DESTDIR}${LIBDIR_BASE}/libmp.a LIBMT?= ${DESTDIR}${LIBDIR_BASE}/libmt.a -LIBMTHCA?= ${DESTDIR}${LIBDIR_BASE}/libmthca.a LIBNANDFS?= ${DESTDIR}${LIBDIR_BASE}/libnandfs.a LIBNCURSES?= ${DESTDIR}${LIBDIR_BASE}/libncurses.a LIBNCURSESW?= ${DESTDIR}${LIBDIR_BASE}/libncursesw.a diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index ac3f9c2..3064027 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -190,18 +190,16 @@ _LIBRARIES+= \ _LIBRARIES+= \ cxgb4 \ ibcm \ - ibcommon \ ibmad \ - ibsdp \ + ibnetdisc \ ibumad \ ibverbs \ mlx4 \ - mthca \ - opensm \ - osmcomp \ - osmvendor \ + mlx5 \ rdmacm \ - + osmcomp \ + opensm \ + osmvendor .endif # Each library's LIBADD needs to be duplicated here for static linkage of @@ -325,17 +323,21 @@ _DP_zfs= md pthread umem util uutil m nvpair avl bsdxml geom nvpair z \ zfs_core _DP_zfs_core= nvpair _DP_zpool= md pthread z nvpair avl umem + +# OFED support .if ${MK_OFED} != "no" _DP_cxgb4= ibverbs pthread _DP_ibcm= ibverbs -_DP_ibmad= ibcommon ibumad -_DP_ibumad= ibcommon +_DP_ibmad= ibumad +_DP_ibnetdisc= osmcomp ibmad ibumad +_DP_ibumad= +_DP_ibverbs= _DP_mlx4= ibverbs pthread -_DP_mthca= ibverbs pthread -_DP_opensm= pthread -_DP_osmcomp= pthread -_DP_osmvendor= ibumad opensm osmcomp pthread +_DP_mlx5= ibverbs pthread _DP_rdmacm= ibverbs +_DP_osmcomp= pthread +_DP_opensm= pthread +_DP_osmvendor= ibumad pthread .endif # Define special cases @@ -473,19 +475,21 @@ LIBUUTILDIR= ${OBJTOP}/cddl/lib/libuutil LIBZFSDIR= ${OBJTOP}/cddl/lib/libzfs LIBZFS_COREDIR= ${OBJTOP}/cddl/lib/libzfs_core LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool -LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libcxgb4 -LIBIBCMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcm -LIBIBCOMMONDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibcommon -LIBIBMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibmad -LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibumad -LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/usr.lib/libibverbs -LIBMLX4DIR= ${OBJTOP}/contrib/ofed/usr.lib/libmlx4 -LIBMTHCADIR= ${OBJTOP}/contrib/ofed/usr.lib/libmthca -LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/usr.lib/libopensm -LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmcomp -LIBOSMVENDORDIR= ${OBJTOP}/contrib/ofed/usr.lib/libosmvendor -LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/usr.lib/librdmacm -LIBIBSDPDIR= ${OBJTOP}/contrib/ofed/usr.lib/libsdp + +# OFED support +LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/libcxgb4 +LIBIBCMDIR= ${OBJTOP}/contrib/ofed/libibcm +LIBIBMADDIR= ${OBJTOP}/contrib/ofed/libibmad +LIBIBNETDISCDIR=${OBJTOP}/contrib/ofed/libibnetdisc +LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/libibumad +LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/libibverbs +LIBMLX4DIR= ${OBJTOP}/contrib/ofed/libmlx4 +LIBMLX5DIR= ${OBJTOP}/contrib/ofed/libmlx5 +LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/librdmacm +LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/opensm/complib +LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/opensm/libopensm +LIBOSMVENDORDIR=${OBJTOP}/contrib/ofed/opensm/libvendor + LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov LIBGOMPDIR= ${OBJTOP}/gnu/lib/libgomp |
