egl: remove the non-haiku scons build

It has been broken since 2011 with commit c98ea26e16b(egl: Make
egl_dri2 and egl_glx built-in drivers.). When the backends got merged
into the main library each entry point was guarded by a
_EGL_BUILT_IN_DRIVER_* define.

As the define was missing, the linker kindly removed the whole of the
dri2 backend, thus we did not notice any errors due to the unresolved
link to xcb and friends.

Cc: Chia-I Wu <olv@lunarg.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/src/SConscript b/src/SConscript
index b0578e892583c14a0759a4196bc17b5e92b0440a..46482fbd62e2a1d19c2cd213ab7707b8d14e3105 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -31,10 +31,6 @@ SConscript('mesa/SConscript')
 if not env['embedded']:
     if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
         SConscript('glx/SConscript')
-    if env['platform'] not in ['darwin', 'haiku', 'sunos', 'windows']:
-        if env['dri']:
-            SConscript('egl/drivers/dri2/SConscript')
-        SConscript('egl/main/SConscript')
     if env['platform'] == 'haiku':
         SConscript('egl/drivers/haiku/SConscript')
         SConscript('egl/main/SConscript')

diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am
index 55be4a75ba5af07dd6eeae787a5557c5b7ea8207..f4649de18dfd580d3af4ec4d4bd20160c3fa4026 100644 (file)
--- a/src/egl/drivers/dri2/Makefile.am
+++ b/src/egl/drivers/dri2/Makefile.am
@@ -69,5 +69,3 @@ if HAVE_EGL_PLATFORM_SURFACELESS
 libegl_dri2_la_SOURCES += platform_surfaceless.c
 AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM
 endif
-
-EXTRA_DIST = SConscript

diff --git a/src/egl/drivers/dri2/SConscript b/src/egl/drivers/dri2/SConscript
deleted file mode 100644 (file)
index 5b03107..0000000
--- a/src/egl/drivers/dri2/SConscript
+++ /dev/null
@@ -1,40 +0,0 @@
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPDEFINES = [
-       'DEFAULT_DRIVER_DIR=\\"\\"'
-])
-
-env.Append(CPPPATH = [
-       '#/include',
-       '#/src/egl/main',
-       '#/src/loader',
-])
-
-sources = [
-       'egl_dri2.c',
-]
-
-if env['x11']:
-       sources.append('platform_x11.c')
-       env.Append(CPPDEFINES = [
-               'HAVE_X11_PLATFORM',
-       ])
-       #env.Append(CPPPATH = [
-       #       'XCB_DRI2_CFLAGS',
-       #])
-
-if env['drm']:
-       env.PkgUseModules('DRM')
-
-env.Prepend(LIBS = [
-       libloader,
-])
-
-egl_dri2 = env.ConvenienceLibrary(
-       target = 'egl_dri2',
-       source = sources,
-)
-
-Export('egl_dri2')

diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
index c0012831bb943cd3a570f0c5e7835591139d9b41..6fc13416a5d138ac8e83fe997824de5bf7286fac 100644 (file)
--- a/src/egl/main/SConscript
+++ b/src/egl/main/SConscript
@@ -10,29 +10,14 @@ env.Append(CPPDEFINES = [
     '_EGL_DRIVER_SEARCH_DIR=\\"\\"',
 ])
 
-if env['platform'] == 'haiku':
-    env.Append(CPPDEFINES = [
-        '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU',
-        '_EGL_OS_UNIX',
-        '_EGL_BUILT_IN_DRIVER_HAIKU',
-    ])
-    env.Prepend(LIBS = [
-        egl_haiku,
-        libloader,
-    ])
-else:
-    env.Append(CPPDEFINES = [
-        '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11',
-        '_EGL_OS_UNIX',
-    ])
-    if env['dri']:
-        env.Prepend(LIBS = [
-            egl_dri2,
-            libloader,
-        ])
-    # Disallow undefined symbols
-    if env['platform'] != 'darwin':
-        env.Append(SHLINKFLAGS = ['-Wl,-z,defs'])
+env.Append(CPPDEFINES = [
+    '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU',
+    '_EGL_OS_UNIX',
+    '_EGL_BUILT_IN_DRIVER_HAIKU',
+])
+env.Prepend(LIBS = [
+    egl_haiku,
+])
 
 env.Append(CPPPATH = [
     '#/include',