Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Dec 2017 17:41:51 -0800
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        Hans Petter Selasky <hps@selasky.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: 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/...
Message-ID:  <afc493a4-4954-842e-5c0a-9a2443dbad55@FreeBSD.org>
In-Reply-To: <19abac3b-8407-abd8-4fe9-c23d6bd7121f@selasky.org>
References:  <201711241450.vAOEoSFW056744@repo.freebsd.org> <ea6c8eb5-f849-df2a-ab80-75d8ebc1edb8@FreeBSD.org> <0fec20d5-cb8f-4937-5dd0-54b8b7461772@selasky.org> <cec48299-e075-fe51-1297-4eb10a4f7619@FreeBSD.org> <19abac3b-8407-abd8-4fe9-c23d6bd7121f@selasky.org>

next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--I0kb8FpVDjAbBbtN2BTUMS6LkwcE885a4
Content-Type: multipart/mixed; boundary="RWHCIixodMEfnjDq5bqW3Ivgl0Gv2CooG";
 protected-headers="v1"
From: Bryan Drewery <bdrewery@FreeBSD.org>
To: Hans Petter Selasky <hps@selasky.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
Message-ID: <afc493a4-4954-842e-5c0a-9a2443dbad55@FreeBSD.org>
Subject: Re: 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/...
References: <201711241450.vAOEoSFW056744@repo.freebsd.org>
 <ea6c8eb5-f849-df2a-ab80-75d8ebc1edb8@FreeBSD.org>
 <0fec20d5-cb8f-4937-5dd0-54b8b7461772@selasky.org>
 <cec48299-e075-fe51-1297-4eb10a4f7619@FreeBSD.org>
 <19abac3b-8407-abd8-4fe9-c23d6bd7121f@selasky.org>
In-Reply-To: <19abac3b-8407-abd8-4fe9-c23d6bd7121f@selasky.org>

--RWHCIixodMEfnjDq5bqW3Ivgl0Gv2CooG
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable

On 12/6/2017 4:53 PM, Hans Petter Selasky wrote:
> On 12/07/17 01:38, Bryan Drewery wrote:
>> 1. SUBDIR=3D../../somewhere else is inherently wrong.
>> 2. Building a library from a directory named '2' is wrong.
>> 3. Not just using proper SUBDIR_DEPEND and making all these subdirs is=

>> not needed and complicates things MORE by splitting them all up.
>> 4. Building a library from a directory where its real bsd.lib.mk is no=
t
>> at is wrong.
>> 5. Depending on an include directory in the Makefile.inc1 library
>> dependencies is simply not needed - I told you that.
>=20
> Try building the COMPAT 32-bit libraries with OFED and you'll see that
> this is needed!
>=20
>> 6. Using these /0 /1 /2 /3 directories actually hurts the 'make
>> libraries' parallelism/dependency graph. It ends up building /1 rather=

>> than building libibcm and libibumad directly in its graph.=C2=A0 It cr=
eates
>> an indirection which adds more unneeded submake recursion.
>=20
> I think this is no argument over having to maintain and update
> Makefile.inc1 with all the dependencies every time there is a change or=

> new driver library added to OFED.

Here's the proper change to contrib/ofed/usr.lib/Makefile, it is trivial.=


> diff --git contrib/ofed/usr.lib/Makefile contrib/ofed/usr.lib/Makefile
> index 47b97591f5b7..9c22b889fa19 100644
> --- contrib/ofed/usr.lib/Makefile
> +++ contrib/ofed/usr.lib/Makefile
> @@ -1,13 +1,24 @@
> -SUBDIR=3D        libibcommon libibmad libibumad libibverbs libmlx4 lib=
mthca \
> -       libopensm libosmcomp libosmvendor libibcm librdmacm libsdp libc=
xgb4
> +SUBDIR=3D \
> +       libibverbs \
> +       libibcm \
> +       libibumad \
> +       librdmacm \
> +       libibmad \
> +       libosmcomp \
> +       libosmvendor \
> +       libcxgb4 \
> +       libmlx4 \
> +       libmlx5 \
> +       libibnetdisc \
> +       libopensm
>=20
>  SUBDIR_DEPEND_libcxgb4=3D        libibverbs
>  SUBDIR_DEPEND_libibcm=3D libibverbs
> -SUBDIR_DEPEND_libibmad=3D libibcommon libibumad
> -SUBDIR_DEPEND_libibumad=3D libibcommon
> +SUBDIR_DEPEND_libibmad=3D        libibumad
> +SUBDIR_DEPEND_libibnetdisc=3D    libosmcomp libibmad libibumad
>  SUBDIR_DEPEND_libmlx4=3D libibverbs
> -SUBDIR_DEPEND_libmthca=3D        libibverbs
> -SUBDIR_DEPEND_libosmvendor=3D    libibumad libopensm libosmcomp
> +SUBDIR_DEPEND_libmlx5=3D libibverbs
> +SUBDIR_DEPEND_libosmvendor=3D    libibumad
>  SUBDIR_DEPEND_librdmacm=3D       libibverbs
>  SUBDIR_PARALLEL=3D
>=20

And Makefile.inc1 which is even more simple.

> @@ -2365,14 +2414,12 @@ _lib_libradius=3D lib/libradius
>  .if ${MK_OFED} !=3D "no"
>  _ofed_lib=3D             contrib/ofed/usr.lib
>  _prebuild_libs+=3D       contrib/ofed/usr.lib/libosmcomp
> -_prebuild_libs+=3D       contrib/ofed/usr.lib/libopensm
> -_prebuild_libs+=3D       contrib/ofed/usr.lib/libibcommon
>  _prebuild_libs+=3D       contrib/ofed/usr.lib/libibverbs
> +_prebuild_libs+=3D       contrib/ofed/usr.lib/libibmad
>  _prebuild_libs+=3D       contrib/ofed/usr.lib/libibumad
>=20
> -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/libibmad__L: contrib/ofed/usr.lib/libibumad__L
>  .endif


--=20
Regards,
Bryan Drewery


--RWHCIixodMEfnjDq5bqW3Ivgl0Gv2CooG--

--I0kb8FpVDjAbBbtN2BTUMS6LkwcE885a4
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBAgAGBQJaKJxfAAoJEDXXcbtuRpfPHsQIAJzYK8LzNt2uVxR0RMEQQojt
tWlidHu4cbmxeusZpn4+QKMGW2az21j7deUwiJN+g3N+WkyGZDreMUm9/pw6gdcn
RvNHtraWGCLXf8S9L6KeR6mo51N8bIi03vL/uvpRpY2a/5CgGkpHtJZ0AmxVCuuD
UAj/ehIDs7JvxszvWzW0RMMyexRL0MXzqRpfntfY6tilc6YzqtD3/PAbXGCyrXg7
ihMVefng/Eab5SpW1Q6vo04YYFGquHXpfYPadOwRGOzLrydOPcnVOn1HoApBC/Lh
1JAys6JPy2bF+0NLgW5cG/JSJIjLD8LEzRT90JYcboAN4GXw2fDT8Tt6+Huugyc=
=W/MV
-----END PGP SIGNATURE-----

--I0kb8FpVDjAbBbtN2BTUMS6LkwcE885a4--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?afc493a4-4954-842e-5c0a-9a2443dbad55>