From owner-svn-src-projects@freebsd.org Fri Nov 17 07:49:55 2017 Return-Path: Delivered-To: svn-src-projects@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 4B800DBD325 for ; Fri, 17 Nov 2017 07:49:55 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 131277E252; Fri, 17 Nov 2017 07:49:54 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [62.141.128.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 01EAA2603B1; Fri, 17 Nov 2017 08:49:51 +0100 (CET) Subject: Re: svn commit: r325894 - projects/bsd_rdma_4_9 To: Bryan Drewery , src-committers@freebsd.org, svn-src-projects@freebsd.org References: <201711161513.vAGFDThx060235@repo.freebsd.org> <97fb917d-8495-6ccf-9772-6b05da10e5f1@selasky.org> From: Hans Petter Selasky Message-ID: Date: Fri, 17 Nov 2017 08:47:09 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Nov 2017 07:49:55 -0000 On 11/17/17 00:47, Bryan Drewery wrote: > 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? Hi, I'll do some experiments today. > > 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. I'm aware about the duplication. The reason is simply that we want to build contrib/ofed as a standalone target. Currently it only works with buildworld, due to the _ofed_lib only being active during buildworld. Why can't the _ofed_lib be embedded inside the contrib/ofed/Makefile ? > > 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 The complexity is there to support standalone builds. > > 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. I see. I'll try to clean it up a bit more today. Thanks for your input. --HPS