Date: Wed, 6 Dec 2017 16:10:29 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Hans Petter Selasky <hselasky@FreeBSD.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: <ea6c8eb5-f849-df2a-ab80-75d8ebc1edb8@FreeBSD.org> In-Reply-To: <201711241450.vAOEoSFW056744@repo.freebsd.org> References: <201711241450.vAOEoSFW056744@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--gAde4lAE7MTi2iDfcB5h56iu1VnthhhDX
Content-Type: multipart/mixed; boundary="spVduI3t8v5ursx5GxuebkPffu7ISarGQ";
protected-headers="v1"
From: Bryan Drewery <bdrewery@FreeBSD.org>
To: Hans Petter Selasky <hselasky@FreeBSD.org>, src-committers@freebsd.org,
svn-src-all@freebsd.org, svn-src-head@freebsd.org
Message-ID: <ea6c8eb5-f849-df2a-ab80-75d8ebc1edb8@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>
In-Reply-To: <201711241450.vAOEoSFW056744@repo.freebsd.org>
--spVduI3t8v5ursx5GxuebkPffu7ISarGQ
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable
On 11/24/2017 6:50 AM, Hans Petter Selasky wrote:
> Modified: head/Makefile.inc1
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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=3D lib/libradius
> .endif
> =20
> .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/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=3D \
> +contrib/ofed/include \
> +contrib/ofed/usr.lib/0 \
> +contrib/ofed/usr.lib/1 \
> +contrib/ofed/usr.lib/2 \
> +contrib/ofed/usr.lib/3
> =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/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
=2E..
> ~/git/freebsd # cat contrib/ofed/usr.lib/0/Makefile
> # $FreeBSD$
>=20
> SUBDIR=3D \
> ../../libibverbs
>=20
> SUBDIR_PARALLEL=3D
>=20
> .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.
--=20
Regards,
Bryan Drewery
--spVduI3t8v5ursx5GxuebkPffu7ISarGQ--
--gAde4lAE7MTi2iDfcB5h56iu1VnthhhDX
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
iQEcBAEBAgAGBQJaKIb1AAoJEDXXcbtuRpfPqsQH/3/oBEWbQ8fZvVH62XuTCUB6
eqhrSOmKXGcSrUSGNzAy/8Q6BKiOysXsPcRSgG6wz/FhqpodFUXDGtd0ZYLKthUV
U716jT+L3XOz6FSfqTMKnApqSJblcGDbLJQYiDhvtZ9EWeNSv2sJiqMPNeXMKYp7
WwNyxIcyPaPnoMIJC7THWixCrNPLJf174qRtv4nJtCHzzeJ/Ul3t0UTD1V6NqMts
Oi9Ns4Dr01v0dlflTth0Hnj8fjXSjNEz1WTzW96FCDB5g0ZTiUdDaXQrYZ6Y++kC
vuRkXeCVWrw7+zQ6llTO9qsrgVOpn/s3CuueNvdQam1xgbdXuj+Sbea5/3FF9hA=
=jG6z
-----END PGP SIGNATURE-----
--gAde4lAE7MTi2iDfcB5h56iu1VnthhhDX--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ea6c8eb5-f849-df2a-ab80-75d8ebc1edb8>