svn commit: r325894 - projects/bsd_rdma_4_9

[Bryan Drewery]

On 11/16/2017 1:12 PM, Hans Petter Selasky wrote:
> On 11/16/17 17:56, Bryan Drewery wrote:
>> On 11/16/2017 7:13 AM, Hans Petter Selasky wrote:
>>> Author: hselasky
>>> Date: Thu Nov 16 15:13:28 2017
>>> New Revision: 325894
>>> URL: https://svnweb.freebsd.org/changeset/base/325894
>>>
>>> Log:
>>>    Update list of hardcoded OFED build order dependencies for
>>>    the buildworld target.
>>>       Sponsored by:    Mellanox Technologies
>>>
>>> Modified:
>>>    projects/bsd_rdma_4_9/Makefile.inc1
>>>
> 
> Hi,
> 
>>>
>>
>> This isn't right, you don't need to include any 'include' directories in
>> here as 'make includes' is ran before 'make libraries'.
> 
> I tried leaving the include directory out and it failed.

1.
I don't see any reason for that.  You shouldn't need
contrib/ofed/include__L anywhere nor contrib/ofed/include in _ofed_lib list.
I see contrib/ofed/include hooked up fine for 'make _includes' so long
as WITH_OFED is defined.

What was the error?


2.
Unrelated but I don't like the new directory structure of
contrib/ofed/usr.bin/* -> contrib/ofed/*.  Now we have contributed
sources in with our FreeBSD Makefiles.

It also makes it more complex in the _ofed_lib list since before we
could just have contrib/ofed/usr.lib but now must list out every library.

3.
contrib/ofed/Makefile is also super complex now.  It should really just
look like the Makefile.inc1 changes (minus the include and libthr
directories).  Just add a .WAIT after include in SUBDIR and make it first.
You have this chained dependency thing but dependencies are already
inherited just fine.
SUBDIR_DEPEND_foo= bar
SUBDIR_DEPEND_baz= foo

baz will implicitly depend on bar being built, there's no need to
explicitly add bar as a dependency but it's not wrong to do so if it has
a LIBADD on it.

> 
>>
>> You don't need libthr either as it is in prebuild_libs which is built
>> before all of this.
> 
> OK. I'll update it tomorrow.
> 
>>
>> I suspect the actual change needed is far smaller than this.
>>
> 
> Thank you for your review.
> 
> --HPS


-- 
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-projects/attachments/20171116/eda60487/attachment.sig>