Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210316205838.2164464-1-luiz.dentz@gmail.com>
 <FD38AD5A-FADA-4EBB-AC7C-BD91F50EE248@holtmann.org> <CABBYNZ+zmuN+UKOXvSgh7EMbsoZTp=9gZ7-CCPpr0V3BT+qkbg@mail.gmail.com>
In-Reply-To: <CABBYNZ+zmuN+UKOXvSgh7EMbsoZTp=9gZ7-CCPpr0V3BT+qkbg@mail.gmail.com>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Wed, 17 Mar 2021 13:42:23 -0700
Message-ID: <CABBYNZ+-VHu-GAb7g6XF15V3fm9XzrvXV6c_V6Uj1-1SgivQ2Q@mail.gmail.com>
Subject: Re: [PATCH BlueZ] build: Fix build with latest tree
To:     Marcel Holtmann <marcel@holtmann.org>
Cc:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>,
        Denis Kenzior <denkenz@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi Marcel,

On Wed, Mar 17, 2021 at 11:29 AM Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
>
> Hi Marcel,
>
> On Wed, Mar 17, 2021 at 1:38 AM Marcel Holtmann <marcel@holtmann.org> wrote:
> >
> > Hi Luiz,
> >
> > > Latest ell tree has introduced useful.h and main-private.h which are
> > > required to build:
> > >
> > > ell/cert-crypto.c:35:10: fatal error: useful.h: No such file or
> > > directory
> > >   35 | #include "useful.h"
> > >         |          ^~~~~~~~~~
> > > ...
> > > ---
> > > Makefile.am | 4 +++-
> > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/Makefile.am b/Makefile.am
> > > index ff0df2196..7fce2e7c0 100644
> > > --- a/Makefile.am
> > > +++ b/Makefile.am
> > > @@ -135,7 +135,9 @@ ell_headers = ell/util.h \
> > >                       ell/asn1-private.h \
> > >                       ell/cert-private.h \
> > >                       ell/pem-private.h \
> > > -                     ell/uuid.h
> > > +                     ell/uuid.h \
> > > +                     ell/useful.h \
> > > +                     ell/main-private.h
> > >
> >
> > this is the wrong fix. It will break in the tarballs. ELL will not install ell/useful.h ever. So every tarball needs to ensure that ell/useful.h is included. Which means you need to follow the fix from iwd here.
>
> Are you talking about this:
>
> https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=ed05585063f2e6d8f2fcd5f008b861062ac7a429
>
> Shall we use the same mechanism to link the headers?

I tried with distcheck to see what would be included in the tarball,
both useful.h and main-private.h do appear to be included, perhaps you
are saying that when we use non-built-in/shared ell
(--enable-external-ell) those headers are not installed, but I guess
in that case we don't need the private header as we won't be using the
built-in sources, or I'm missing something. That said perhaps this is
different in case of iwd as it seems to be using useful.h directly:

https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=17cf4da72613e80d08d51401399d02683ba8664b

-- 
Luiz Augusto von Dentz