From owner-svn-src-all@freebsd.org Thu Dec 7 00:10:30 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C300E91173; Thu, 7 Dec 2017 00:10:30 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC4116968D; Thu, 7 Dec 2017 00:10:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 3520015A64; Thu, 7 Dec 2017 00:10:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 72AC72B3A; Thu, 7 Dec 2017 00:10:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id wCcFPCbAYfSn; Thu, 7 Dec 2017 00:10:25 +0000 (UTC) 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/... DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 4BBBF2B34 To: Hans Petter Selasky , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201711241450.vAOEoSFW056744@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Wed, 6 Dec 2017 16:10:29 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <201711241450.vAOEoSFW056744@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gAde4lAE7MTi2iDfcB5h56iu1VnthhhDX" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 00:10:30 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --gAde4lAE7MTi2iDfcB5h56iu1VnthhhDX Content-Type: multipart/mixed; boundary="spVduI3t8v5ursx5GxuebkPffu7ISarGQ"; protected-headers="v1" From: Bryan Drewery To: Hans Petter Selasky , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: 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 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--