svn commit: r326169 - in head: . contrib/ofed lib/libc/locale share/mk sys/amd64/amd64 sys/amd64/conf sys/conf sys/contrib/rdma/krping sys/dev/cxgbe sys/dev/cxgbe/common sys/dev/cxgbe/iw_cxgbe sys/...

Bryan Drewery bdrewery at FreeBSD.org
Thu Dec 7 00:10:30 UTC 2017


On 11/24/2017 6:50 AM, Hans Petter Selasky wrote:
> Modified: head/Makefile.inc1
> ==============================================================================
> --- head/Makefile.inc1	Fri Nov 24 14:29:32 2017	(r326168)
> +++ head/Makefile.inc1	Fri Nov 24 14:50:28 2017	(r326169)
> @@ -2410,16 +2410,24 @@ _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
> +#
> +# 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
>  
> -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/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
>  .endif


...

> ~/git/freebsd # cat contrib/ofed/usr.lib/0/Makefile
> # $FreeBSD$
> 
> SUBDIR= \
> ../../libibverbs
> 
> SUBDIR_PARALLEL=
> 
> .include <bsd.subdir.mk>


I'm a bit speechless.  Why??  The old version was 90% fine and I sent
you advice on how to make it work with the new layout.


-- 
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-all/attachments/20171206/13c3024d/attachment.sig>


More information about the svn-src-all mailing list