[Mesa-stable] [PATCH 2/2] st/egl: don't ship the dri2, c link at the tarball

[Jose Fonseca]

On 23/03/15 16:15, Emil Velikov wrote:
> During 'make dist' the path of the symbolic link (x11/dri2.c) becomes
> too long, and tar converts it to hard one. To make it more complicated
> on Haiku tar errors out (due to lack of hardlink support) rather than
> falling back to the next best thing.
> So remove the symlink from git, and disable the scons x11_drm egl code.
> The offending code is not build with either automake nor android.
>
> Brian, Jose would you have any objections against this ? I was
> playing around to get the symlink resolved, although I could not get the
> dependency tracking resolved, so env.Command() was never executed :-\

No objections from me.

Jose

>
> Bugzilla: https://urldefense.proofpoint.com/v2/url?u=https-3A__bugs.freedesktop.org_show-5Fbug.cgi-3Fid-3D89680&d=AwIBAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=zfmBZnnVGHeYde45pMKNnVyzeaZbdIqVLprmZCM2zzE&m=kbkQvZ91MLwWiICIjaqFjJvTbTcid8jb6N_JvWRj5RU&s=0lsus4gaJqwWUadyxbcfiCq529HufHm5uSHMHUmqj7s&e=
> Cc: mesa-stable at lists.freedesktop.org
> Cc: Brian Paul <brianp at vmware.com>
> Cc: Jose Fonseca <jfonseca at vmware.com>
> Cc: Alexander von Gluck IV <kallisti5 at unixzen.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>
> Alexander this and the previous patch things should get mesa 10.5
> building correctly on your platform. I have uploaded temporary tarballs
> at https://urldefense.proofpoint.com/v2/url?u=http-3A__people.freedesktop.org_-7Eevelikov_fdo89680_&d=AwIBAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=zfmBZnnVGHeYde45pMKNnVyzeaZbdIqVLprmZCM2zzE&m=kbkQvZ91MLwWiICIjaqFjJvTbTcid8jb6N_JvWRj5RU&s=JZ1rv3J0vuOmjLmYDnILD7VMo-ktGY2JW5q0v3ZPM0g&e=
>
> Can you give them a try ?
>
> Thanks
> Emil
>
>
>   src/gallium/state_trackers/egl/Makefile.sources | 1 -
>   src/gallium/state_trackers/egl/SConscript       | 3 ++-
>   src/gallium/state_trackers/egl/x11/dri2.c       | 1 -
>   3 files changed, 2 insertions(+), 3 deletions(-)
>   delete mode 120000 src/gallium/state_trackers/egl/x11/dri2.c
>
> diff --git a/src/gallium/state_trackers/egl/Makefile.sources b/src/gallium/state_trackers/egl/Makefile.sources
> index 03ded58..0551c16 100644
> --- a/src/gallium/state_trackers/egl/Makefile.sources
> +++ b/src/gallium/state_trackers/egl/Makefile.sources
> @@ -52,6 +52,5 @@ x11_FILES := \
>   	x11/native_ximage.c
>
>   x11_drm_FILES := \
> -	x11/dri2.c \
>   	x11/x11_screen.c \
>   	x11/x11_screen.h
> diff --git a/src/gallium/state_trackers/egl/SConscript b/src/gallium/state_trackers/egl/SConscript
> index 3727fb2..a94abc2 100644
> --- a/src/gallium/state_trackers/egl/SConscript
> +++ b/src/gallium/state_trackers/egl/SConscript
> @@ -39,7 +39,8 @@ else:
>               '#/src/mapi',
>           ])
>           sources.append(env.ParseSourceList('Makefile.sources', 'x11_FILES'))
> -        if env['drm']:
> +        if env['drm'] and False:
> +            # XXX: Disabled as we're don't generate the x11/dri2.c symlink at buildtime.
>               env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING'])
>               sources.append(env.ParseSourceList('Makefile.sources', 'x11_drm_FILES'))
>       if env['drm'] and False:
> diff --git a/src/gallium/state_trackers/egl/x11/dri2.c b/src/gallium/state_trackers/egl/x11/dri2.c
> deleted file mode 120000
> index 344a11c..0000000
> --- a/src/gallium/state_trackers/egl/x11/dri2.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -../../../../glx/dri2.c
> \ No newline at end of file
>