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
signature.asc
Description: OpenPGP digital signature
