svn commit: r325894 - projects/bsd_rdma_4_9

[Bryan Drewery]

On 11/16/2017 7:13 AM, Hans Petter Selasky wrote:
> Author: hselasky
> Date: Thu Nov 16 15:13:28 2017
> New Revision: 325894
> URL: https://svnweb.freebsd.org/changeset/base/325894
> 
> Log:
>   Update list of hardcoded OFED build order dependencies for
>   the buildworld target.
>   
>   Sponsored by:	Mellanox Technologies
> 
> Modified:
>   projects/bsd_rdma_4_9/Makefile.inc1
> 
> Modified: projects/bsd_rdma_4_9/Makefile.inc1
> ==============================================================================
> --- projects/bsd_rdma_4_9/Makefile.inc1	Thu Nov 16 14:37:18 2017	(r325893)
> +++ projects/bsd_rdma_4_9/Makefile.inc1	Thu Nov 16 15:13:28 2017	(r325894)
> @@ -2410,16 +2410,33 @@ _lib_libradius=	lib/libradius
>  .endif
>  
>  .if ${MK_OFED} != "no"
> -_ofed_lib=		contrib/ofed/usr.lib
> -_prebuild_libs+=	contrib/ofed/usr.lib/libosmcomp
> -_prebuild_libs+=	contrib/ofed/usr.lib/libopensm
> -_prebuild_libs+=	contrib/ofed/usr.lib/libibcommon
> -_prebuild_libs+=	contrib/ofed/usr.lib/libibverbs
> -_prebuild_libs+=	contrib/ofed/usr.lib/libibumad
> +_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/libopensm__L: lib/libthr__L
> -contrib/ofed/usr.lib/libosmcomp__L: lib/libthr__L
> -contrib/ofed/usr.lib/libibumad__L: contrib/ofed/usr.lib/libibcommon__L
> +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
>  .endif
>  
>  .if ${MK_CASPER} != "no"
> 

This isn't right, you don't need to include any 'include' directories in
here as 'make includes' is ran before 'make libraries'.

You don't need libthr either as it is in prebuild_libs which is built
before all of this.

I suspect the actual change needed is far smaller than this.

-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-projects/attachments/20171116/efa767ff/attachment.sig>