summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-03-21 22:09:03 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-03-25 21:28:08 +0000
commit2beab3c01c7be935fc7d2f1f025373cadebdeb4d (patch)
treef28c3bc0c012dee7d4c73ba489f0a3d2a2065d92
parentd80bc65016671abccaac3746efba0f1d704b7d07 (diff)
st/egl: don't ship the dri2.c link at the tarball
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 :-\ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89680 Cc: mesa-stable@lists.freedesktop.org Cc: Alexander von Gluck IV <kallisti5@unixzen.com> Cc: Brian Paul <brianp@vmware.com> Acked-by: Jose Fonseca <jfonseca@vmware.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--src/gallium/state_trackers/egl/Makefile.sources1
-rw-r--r--src/gallium/state_trackers/egl/SConscript3
l---------src/gallium/state_trackers/egl/x11/dri2.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/egl/Makefile.sources b/src/gallium/state_trackers/egl/Makefile.sources
index 03ded584969..0551c161110 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 3727fb2b047..a94abc2d081 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 344a11c1f83..00000000000
--- a/src/gallium/state_trackers/egl/x11/dri2.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../glx/dri2.c \ No newline at end of file