From owner-svn-src-projects@freebsd.org Fri Nov 24 09:01:10 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EF62DC120E for ; Fri, 24 Nov 2017 09:01:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13E846B67A; Fri, 24 Nov 2017 09:01:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAO919Rr009708; Fri, 24 Nov 2017 09:01:09 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAO918sE009700; Fri, 24 Nov 2017 09:01:08 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201711240901.vAO918sE009700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 24 Nov 2017 09:01:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r326146 - in projects/bsd_rdma_4_9: . contrib/ofed contrib/ofed/usr.bin contrib/ofed/usr.lib contrib/ofed/usr.lib/0 contrib/ofed/usr.lib/1 contrib/ofed/usr.lib/2 contrib/ofed/usr.lib/3 X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in projects/bsd_rdma_4_9: . contrib/ofed contrib/ofed/usr.bin contrib/ofed/usr.lib contrib/ofed/usr.lib/0 contrib/ofed/usr.lib/1 contrib/ofed/usr.lib/2 contrib/ofed/usr.lib/3 X-SVN-Commit-Revision: 326146 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Nov 2017 09:01:10 -0000 Author: hselasky Date: Fri Nov 24 09:01:08 2017 New Revision: 326146 URL: https://svnweb.freebsd.org/changeset/base/326146 Log: Simplify the build dependencies when building the OFED libraries. Suggested by: bdrewery@ Sponsored by: Mellanox Technologies Added: projects/bsd_rdma_4_9/contrib/ofed/usr.bin/ projects/bsd_rdma_4_9/contrib/ofed/usr.bin/Makefile (contents, props changed) projects/bsd_rdma_4_9/contrib/ofed/usr.lib/ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/0/ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/0/Makefile (contents, props changed) projects/bsd_rdma_4_9/contrib/ofed/usr.lib/1/ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/1/Makefile (contents, props changed) projects/bsd_rdma_4_9/contrib/ofed/usr.lib/2/ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/2/Makefile (contents, props changed) projects/bsd_rdma_4_9/contrib/ofed/usr.lib/3/ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/3/Makefile (contents, props changed) projects/bsd_rdma_4_9/contrib/ofed/usr.lib/Makefile (contents, props changed) Modified: projects/bsd_rdma_4_9/Makefile.inc1 projects/bsd_rdma_4_9/contrib/ofed/Makefile Modified: projects/bsd_rdma_4_9/Makefile.inc1 ============================================================================== --- projects/bsd_rdma_4_9/Makefile.inc1 Fri Nov 24 07:35:08 2017 (r326145) +++ projects/bsd_rdma_4_9/Makefile.inc1 Fri Nov 24 09:01:08 2017 (r326146) @@ -2410,33 +2410,20 @@ _lib_libradius= lib/libradius .endif .if ${MK_OFED} != "no" +# +# The OFED libraries are built in four steps +# as reflected below, due to interdependencies. +# _ofed_lib= \ -contrib/ofed/include \ -contrib/ofed/libcxgb4 \ -contrib/ofed/libibcm \ -contrib/ofed/libibmad \ -contrib/ofed/libibnetdisc \ -contrib/ofed/libibumad \ -contrib/ofed/libibverbs \ -contrib/ofed/libmlx4 \ -contrib/ofed/libmlx5 \ -contrib/ofed/librdmacm \ -contrib/ofed/opensm/complib \ -contrib/ofed/opensm/libopensm \ -contrib/ofed/opensm/libvendor +contrib/ofed/usr.lib/0 \ +contrib/ofed/usr.lib/1 \ +contrib/ofed/usr.lib/2 \ +contrib/ofed/usr.lib/3 -contrib/ofed/libcxgb4__L: contrib/ofed/libibverbs__L lib/libthr__L contrib/ofed/include__L -contrib/ofed/libibcm__L: contrib/ofed/libibverbs__L contrib/ofed/include__L -contrib/ofed/libibmad__L: contrib/ofed/libibumad__L contrib/ofed/include__L -contrib/ofed/libibnetdisc__L: contrib/ofed/opensm/complib__L contrib/ofed/libibmad__L contrib/ofed/libibumad__L contrib/ofed/include__L -contrib/ofed/libibumad__L: contrib/ofed/include__L -contrib/ofed/libibverbs__L: contrib/ofed/include__L -contrib/ofed/libmlx4__L: contrib/ofed/libibverbs__L lib/libthr__L contrib/ofed/include__L -contrib/ofed/libmlx5__L: contrib/ofed/libibverbs__L lib/libthr__L contrib/ofed/include__L -contrib/ofed/librdmacm__L: contrib/ofed/libibverbs__L contrib/ofed/include__L -contrib/ofed/opensm/complib__L: lib/libthr__L contrib/ofed/include__L -contrib/ofed/opensm/libopensm__L: lib/libthr__L contrib/ofed/include__L -contrib/ofed/opensm/libvendor__L: contrib/ofed/libibumad__L lib/libthr__L contrib/ofed/include__L +contrib/ofed/usr.lib/0__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 .endif .if ${MK_CASPER} != "no" Modified: projects/bsd_rdma_4_9/contrib/ofed/Makefile ============================================================================== --- projects/bsd_rdma_4_9/contrib/ofed/Makefile Fri Nov 24 07:35:08 2017 (r326145) +++ projects/bsd_rdma_4_9/contrib/ofed/Makefile Fri Nov 24 09:01:08 2017 (r326146) @@ -1,47 +1,10 @@ # $FreeBSD$ -SUBDIR_A_DEPEND= -SUBDIR_A= \ -include +# NOTE: Make sure WITH_OFED=YES is set when building this top-level directory. -SUBDIR_B_DEPEND= ${SUBDIR_A} -SUBDIR_B= \ -libibverbs - -SUBDIR_C_DEPEND= ${SUBDIR_B} -SUBDIR_C= \ -libibcm \ -libibumad - -SUBDIR_D_DEPEND= ${SUBDIR_C} -SUBDIR_D= \ -librdmacm \ -libibmad \ -opensm/complib \ -opensm/libvendor \ -libcxgb4 \ -libmlx4 \ -libmlx5 - -SUBDIR_E_DEPEND= ${SUBDIR_D} -SUBDIR_E= \ -libibverbs/examples/build \ -librdmacm/examples/build \ -libibnetdisc \ -opensm/libopensm - -SUBDIR_F_DEPEND= ${SUBDIR_E} -SUBDIR_F= \ -opensm/opensm \ -infiniband-diags/build - -.for L in A B C D E F -.for S in ${SUBDIR_${L}} -SUBDIR_DEPEND_${S}+= ${SUBDIR_${L}_DEPEND} -.endfor -SUBDIR+= ${SUBDIR_${L}} -.endfor - -SUBDIR_PARALLEL= +SUBDIR= \ +include \ +usr.lib \ +usr.bin .include Added: projects/bsd_rdma_4_9/contrib/ofed/usr.bin/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9/contrib/ofed/usr.bin/Makefile Fri Nov 24 09:01:08 2017 (r326146) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +SUBDIR= \ +../libibverbs/examples/build \ +../librdmacm/examples/build \ +../opensm/opensm \ +../infiniband-diags/build + +SUBDIR_PARALLEL= + +.include Added: projects/bsd_rdma_4_9/contrib/ofed/usr.lib/0/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/0/Makefile Fri Nov 24 09:01:08 2017 (r326146) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +SUBDIR= \ +../../libibverbs + +SUBDIR_PARALLEL= + +.include Added: projects/bsd_rdma_4_9/contrib/ofed/usr.lib/1/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/1/Makefile Fri Nov 24 09:01:08 2017 (r326146) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +SUBDIR= \ +../../libibcm \ +../../libibumad + +SUBDIR_PARALLEL= + +.include Added: projects/bsd_rdma_4_9/contrib/ofed/usr.lib/2/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/2/Makefile Fri Nov 24 09:01:08 2017 (r326146) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +SUBDIR= \ +../../librdmacm \ +../../libibmad \ +../../opensm/complib \ +../../opensm/libvendor \ +../../libcxgb4 \ +../../libmlx4 \ +../../libmlx5 + +SUBDIR_PARALLEL= + +.include Added: projects/bsd_rdma_4_9/contrib/ofed/usr.lib/3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/3/Makefile Fri Nov 24 09:01:08 2017 (r326146) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +SUBDIR= \ +../../libibnetdisc \ +../../opensm/libopensm + +SUBDIR_PARALLEL= + +.include Added: projects/bsd_rdma_4_9/contrib/ofed/usr.lib/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9/contrib/ofed/usr.lib/Makefile Fri Nov 24 09:01:08 2017 (r326146) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +# NOTE: If building outside the buildworld target, install each subdirectory +# before building the next one. + +SUBDIR=0 1 2 3 + +.include