[Mesa-dev] [PATCH 01/14] egl: remove the non-haiku scons build

[Emil Velikov]

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 at lunarg.com>
Cc: Jose Fonseca <jfonseca at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/SConscript                   |  4 ----
 src/egl/drivers/dri2/Makefile.am |  2 --
 src/egl/drivers/dri2/SConscript  | 40 ----------------------------------------
 src/egl/main/SConscript          | 31 ++++++++-----------------------
 4 files changed, 8 insertions(+), 69 deletions(-)
 delete mode 100644 src/egl/drivers/dri2/SConscript

diff --git a/src/SConscript b/src/SConscript
index b0578e8..46482fb 100644
--- 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 55be4a7..f4649de 100644
--- 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
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 c001283..6fc1341 100644
--- 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',
-- 
2.4.5