[Mesa-dev] [PATCH 2/2] egl/scons: Fix every platform getting dri and haiku added e7e29189

Emil Velikov emil.l.velikov at gmail.com
Fri Aug 7 13:10:48 PDT 2015


On 7 August 2015 at 20:56, Alexander von Gluck IV <kallisti5 at unixzen.com> wrote:
> On 2015-08-07 14:49, Emil Velikov wrote:
>>
>> Ouch seems like a git rebase slip, as I was nuking the final dri scons
>> target around the same time.
>>
>> On 07/08/15 19:19, Alexander von Gluck IV wrote:> ---
>>>
>>>  src/egl/SConscript | 17 ++++++++++-------
>>>  1 file changed, 10 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/src/egl/SConscript b/src/egl/SConscript
>>> index 1b2a427..00761e8 100644
>>> --- a/src/egl/SConscript
>>> +++ b/src/egl/SConscript
>>> @@ -15,14 +15,17 @@ env.Append(CPPPATH = [
>>>
>>>  # parse Makefile.sources
>>>  egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES')
>>> -egl_sources.append(env.ParseSourceList('Makefile.sources',
>>> 'dri2_backend_core_FILES'))
>>>
>> As this Sconscript is included only for haiku (see src/SConscript) we
>> can remove only the above line, and keep everything else intact. The
>> commit message could use an update though.
>>
>> To keep make things easier would be better to use this as 1/2 of the
>> series.
>>
>> Sorry for breaking things. I tried really hard to avoid that but I seems
>> to have missed a line.
>>
>> With the above suggestions
>> Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
>
>
> ah.. I pushed 1/2 up as-is after Matt's ack before your review.
>
> Are we sure we want to completely drop support for scons building EGL
> on all platforms except Haiku?
>
To drop == has been dropped. The last target that we had was broken
for ~4 years. See commit 78674631a2d(egl: remove the non-haiku scons
build)

-Emil


More information about the mesa-dev mailing list