[Mesa-dev] [PATCH 2/2] egl: add linux-dmabuf-unstable-v1-protocol.c to "nodist"

[Emil Velikov]

On 20 July 2017 at 15:42, Andres Gomez <agomez at igalia.com> wrote:
> On Thu, 2017-07-20 at 14:37 +0100, Emil Velikov wrote:
>> On 20 July 2017 at 13:54, Daniel Stone <daniel at fooishbar.org> wrote:
>> > Hi Emil,
>> >
>> > On 20 July 2017 at 13:51, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> > > On 19 July 2017 at 23:44, Andres Gomez <agomez at igalia.com> wrote:
>> > > > -dri2_backend_FILES += drivers/dri2/platform_wayland.c  \
>> > > > -       drivers/dri2/linux-dmabuf-unstable-v1-protocol.c
>> > > > +dri2_backend_FILES += drivers/dri2/platform_wayland.c
>> > > > +nodist_dri2_backend_FILES += drivers/dri2/linux-dmabuf-unstable-v1-protocol.c
>> > > >  endif
>> > > >
>> > > >  if HAVE_PLATFORM_DRM
>> > > > @@ -119,6 +122,9 @@ libEGL_common_la_SOURCES += \
>> > > >         $(dri2_backend_FILES) \
>> > > >         $(dri3_backend_FILES)
>> > > >
>> > > > +nodist_libEGL_common_la_SOURCES += \
>> > > > +       $(nodist_dri2_backend_FILES)
>> > > > +
>> > >
>> > > Just add the files two generated file to BUILT_SOURCES. That's the way
>> > > we handle it through the tree.
>> >
>> > They're already in BUILT_SOURCES (line 78 in master), so I guess
>> > something else is wrong.
>> >
>>
>> Thanks for the correction Dan.
>>
>> Upon a second look - BUILT_SOURCES line is in a conditional which is
>> causing the issue. Moving it outside solves the problem on my system.
>
> Mmmm ... the BUILT_SOURCES is in the same conditional in which the
> linux-dmabuf-unstable-v1-protocol.c target is define so I don't think
> that would be solving the problem and it doesn't seem to be doing so in
> my travis:
> https://travis-ci.org/Igalia/release-mesa/jobs/255687844
>

Moved the HAVE_PLATFORM_WAYLAND guard after the BUILT_SOURCES and
checked the generated file.
Which seemingly is not enough... I have an idea - let's seen how well
it pans out.

-Emil