svn commit: r335825 - in stable/11: . contrib/ofed contrib/ofed/include contrib/ofed/infiniband-diags/build contrib/ofed/libcxgb4 contrib/ofed/libibcm contrib/ofed/libibmad contrib/ofed/libibnetdis...

Konstantin Belousov kib at FreeBSD.org
Sat Jun 30 20:09:45 UTC 2018 

Author: kib
Date: Sat Jun 30 20:09:43 2018
New Revision: 335825
URL: https://svnweb.freebsd.org/changeset/base/335825

Log:
  MFC r335253:
  Rework ofed build.
  
  Sponsored by:	Mellanox Technologies

Added:
  stable/11/lib/ofed/
     - copied from r335253, head/lib/ofed/
  stable/11/usr.bin/ofed/
     - copied from r335253, head/usr.bin/ofed/
Deleted:
  stable/11/contrib/ofed/Makefile
  stable/11/contrib/ofed/include/Makefile
  stable/11/contrib/ofed/infiniband-diags/build/
  stable/11/contrib/ofed/libcxgb4/Makefile
  stable/11/contrib/ofed/libibcm/Makefile
  stable/11/contrib/ofed/libibmad/Makefile
  stable/11/contrib/ofed/libibnetdisc/Makefile
  stable/11/contrib/ofed/libibumad/Makefile
  stable/11/contrib/ofed/libibverbs/Makefile
  stable/11/contrib/ofed/libibverbs/examples/build/
  stable/11/contrib/ofed/libmlx4/Makefile
  stable/11/contrib/ofed/libmlx5/Makefile
  stable/11/contrib/ofed/librdmacm/Makefile
  stable/11/contrib/ofed/librdmacm/examples/build/
  stable/11/contrib/ofed/opensm/complib/Makefile
  stable/11/contrib/ofed/opensm/libopensm/
  stable/11/contrib/ofed/opensm/libvendor/Makefile
  stable/11/contrib/ofed/opensm/opensm/Makefile
  stable/11/contrib/ofed/usr.bin/
  stable/11/contrib/ofed/usr.lib/
Modified:
  stable/11/Makefile.inc1
  stable/11/lib/Makefile
  stable/11/share/mk/src.libnames.mk
  stable/11/usr.bin/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Sat Jun 30 19:50:25 2018	(r335824)
+++ stable/11/Makefile.inc1	Sat Jun 30 20:09:43 2018	(r335825)
@@ -263,9 +263,6 @@ SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
-.if ${MK_OFED} != "no"
-SUBDIR+=contrib/ofed
-.endif
 
 # Local directories are built in parallel with the base system directories.
 # Users may insert a .WAIT directive at the beginning or elsewhere within
@@ -2141,24 +2138,16 @@ _lib_libradius=	lib/libradius
 .endif
 
 .if ${MK_OFED} != "no"
-#
-# The OFED libraries are built in four steps
-# as reflected below, due to interdependencies.
-#
-# NOTE: Depending on contrib/ofed/include is only needed for
-# the lib32 compat build.
-#
-_ofed_lib= \
-contrib/ofed/include \
-contrib/ofed/usr.lib/0 \
-contrib/ofed/usr.lib/1 \
-contrib/ofed/usr.lib/2 \
-contrib/ofed/usr.lib/3
+_prebuild_libs+= \
+	lib/ofed/libibverbs \
+	lib/ofed/libibmad \
+	lib/ofed/libibumad \
+	lib/ofed/complib \
+	lib/ofed/libmlx5
 
-contrib/ofed/usr.lib/0__L: contrib/ofed/include__L lib/libthr__L
-contrib/ofed/usr.lib/1__L: contrib/ofed/usr.lib/0__L
-contrib/ofed/usr.lib/2__L: contrib/ofed/usr.lib/1__L
-contrib/ofed/usr.lib/3__L: contrib/ofed/usr.lib/2__L
+lib/ofed/libibmad__L:	lib/ofed/libibumad__L
+lib/ofed/complib__L:	lib/libthr__L
+lib/ofed/libmlx5__L:	lib/ofed/libibverbs__L lib/libthr__L
 .endif
 
 .if ${MK_CASPER} != "no"
@@ -2169,7 +2158,7 @@ lib/libpjdlog__L: lib/libutil__L
 lib/libcasper__L: lib/libnv__L
 lib/liblzma__L: lib/libthr__L
 
-_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if ${_DIR} == ".WAIT"  || (empty(_generic_libs:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile))
 _generic_libs+= ${_DIR}

Modified: stable/11/lib/Makefile
==============================================================================
--- stable/11/lib/Makefile	Sat Jun 30 19:50:25 2018	(r335824)
+++ stable/11/lib/Makefile	Sat Jun 30 20:09:43 2018	(r335825)
@@ -83,7 +83,7 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	libopenbsd \
 	libopie \
 	libpam \
-	${_libpcap} \
+	libpcap \
 	${_libpe} \
 	libpjdlog \
 	${_libpmc} \
@@ -156,6 +156,9 @@ SUBDIR_DEPEND_libtacplus= libmd
 SUBDIR_DEPEND_libulog= libmd
 SUBDIR_DEPEND_libunbound= ${_libldns}
 SUBDIR_DEPEND_liblzma= ${_libthr}
+.if ${MK_OFED} != "no"
+SUBDIR_DEPEND_libpcap= ofed
+.endif
 
 # NB: keep these sorted by MK_* knobs
 
@@ -271,14 +274,6 @@ _libproc=	libproc
 _librtld_db=	librtld_db
 .endif
 
-.if ${MK_OFED} == "no"
-#
-# When OFED is enabled libpcap is built as part of
-# OFED due to library dependencies
-#
-_libpcap=	libpcap
-.endif
-
 .if ${MACHINE_CPUARCH} == "powerpc"
 _libproc=	libproc
 _librtld_db=	librtld_db
@@ -293,6 +288,7 @@ _libdl=		libdl
 _libproc=	libproc
 _librtld_db=	librtld_db
 .endif
+SUBDIR.${MK_OFED}+=	ofed
 
 .if ${MK_OPENSSL} != "no"
 _libmp=		libmp

Modified: stable/11/share/mk/src.libnames.mk
==============================================================================
--- stable/11/share/mk/src.libnames.mk	Sat Jun 30 19:50:25 2018	(r335824)
+++ stable/11/share/mk/src.libnames.mk	Sat Jun 30 20:09:43 2018	(r335825)
@@ -480,18 +480,18 @@ LIBZFS_COREDIR=	${OBJTOP}/cddl/lib/libzfs_core
 LIBZPOOLDIR=	${OBJTOP}/cddl/lib/libzpool
 
 # 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
+LIBCXGB4DIR=	${OBJTOP}/lib/ofed/libcxgb4
+LIBIBCMDIR=	${OBJTOP}/lib/ofed/libibcm
+LIBIBMADDIR=	${OBJTOP}/lib/ofed/libibmad
+LIBIBNETDISCDIR=${OBJTOP}/lib/ofed/libibnetdisc
+LIBIBUMADDIR=	${OBJTOP}/lib/ofed/libibumad
+LIBIBVERBSDIR=	${OBJTOP}/lib/ofed/libibverbs
+LIBMLX4DIR=	${OBJTOP}/lib/ofed/libmlx4
+LIBMLX5DIR=	${OBJTOP}/lib/ofed/libmlx5
+LIBRDMACMDIR=	${OBJTOP}/lib/ofed/librdmacm
+LIBOSMCOMPDIR=	${OBJTOP}/lib/ofed/complib
+LIBOPENSMDIR=	${OBJTOP}/lib/ofed/libopensm
+LIBOSMVENDORDIR=${OBJTOP}/lib/ofed/libvendor
 
 LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
 LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov

Modified: stable/11/usr.bin/Makefile
==============================================================================
--- stable/11/usr.bin/Makefile	Sat Jun 30 19:50:25 2018	(r335824)
+++ stable/11/usr.bin/Makefile	Sat Jun 30 20:09:43 2018	(r335825)
@@ -306,6 +306,7 @@ SUBDIR.${MK_UTMPX}+=	users
 SUBDIR.${MK_UTMPX}+=	who
 SUBDIR.${MK_SVN}+=	svn
 SUBDIR.${MK_SVNLITE}+=	svn
+SUBDIR.${MK_OFED}+=	ofed
 
 # These are normally only handled for build-tools.
 .if make(clean*)

More information about the svn-src-stable mailing list