From 8aac5d123c4636fad5e9d70c3a6706aaa6f1f240 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 24 Jan 2011 10:35:48 -0800
Subject: [PATCH] Remove talloc from the SCons build system.

---
 src/SConscript                            |  4 ----
 src/gallium/targets/SConscript.dri        |  1 -
 src/gallium/targets/egl-static/SConscript |  2 +-
 src/gallium/targets/libgl-gdi/SConscript  |  1 -
 src/gallium/targets/libgl-xlib/SConscript |  1 -
 src/glsl/SConscript                       | 20 +-------------------
 src/mesa/SConscript                       |  2 --
 src/talloc/SConscript                     | 20 --------------------
 8 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 src/talloc/SConscript

diff --git a/src/SConscript b/src/SConscript
index 06c6f94bf0c..d5cde1c9642 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -2,10 +2,6 @@ Import('*')
 
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
-    SConscript('talloc/SConscript')
-else:
-    talloc = 'talloc'
-    Export('talloc')
 
 SConscript('glsl/SConscript')
 # When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index bc3671a256b..101863a6848 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -72,7 +72,6 @@ COMMON_DRI_DRM_OBJECTS = [
 
 drienv.AppendUnique(LIBS = [
     'expat',
-    'talloc',
 ])
 
 Export([
diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index c978934a0c8..974c35e46a7 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -69,7 +69,7 @@ if env['gles']:
     env.Prepend(LIBPATH = [shared_glapi.dir])
     # manually add LIBPREFIX on windows
     glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi'
-    env.Prepend(LIBS = [glapi_name, talloc, glsl, mesa])
+    env.Prepend(LIBS = [glapi_name, glsl, mesa])
 
 # OpenVG
 if True:
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index c088d4c2ae6..49462a8e309 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -15,7 +15,6 @@ env.Append(LIBS = [
     'user32',
     'kernel32',
     'ws2_32',
-    talloc,
 ])
 
 sources = ['libgl_gdi.c']
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 9bb0a56525e..ca15372f1d9 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -29,7 +29,6 @@ env.Prepend(LIBS = [
     mesa,
     glsl,
     gallium,
-    'talloc'
 ])
 
 sources = [
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 078b400e9d9..6a2347625c7 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -12,9 +12,6 @@ env.Prepend(CPPPATH = [
     '#src/glsl',
 ])
 
-if env['platform'] == 'windows':
-    env.Prepend(CPPPATH = ['#src/talloc'])
-
 sources = [
     'glcpp/glcpp-lex.c',
     'glcpp/glcpp-parse.c',
@@ -88,13 +85,6 @@ if env['platform'] == common.host_platform:
         env.Prepend(CPPPATH = ['#/src/getopt'])
         env.PrependUnique(LIBS = [getopt])
 
-    if env['platform'] == 'windows':
-        env.Prepend(CPPPATH = ['#src/talloc'])
-        env.Prepend(LIBS = [talloc])
-    else:
-        env.Prepend(CPPPATH = ['#include'])
-        env.Prepend(LIBS = ['talloc'])
-
     builtin_compiler = env.Program(
         target = 'builtin_compiler',
         source = sources + ['main.cpp', 'builtin_stubs.cpp',
@@ -111,14 +101,6 @@ if env['platform'] == common.host_platform:
 
     env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
 
-    if env['msvc']:
-        # There is no LD_LIBRARY_PATH equivalent on Windows. We need to ensure
-        # talloc.dll is on the same dir as builtin_function.
-        talloc_dll_src = talloc.dir.File('talloc.dll')
-        talloc_dll_dst = builtin_compiler[0].dir.File('talloc.dll')
-        talloc_dll = env.Command(talloc_dll_dst, talloc_dll_src, Copy(talloc_dll_dst, talloc_dll_src))
-        env.Depends('builtin_function.cpp', talloc_dll)
-
     Export('builtin_glsl_function')
 
     if common.cross_compiling:
@@ -143,7 +125,7 @@ if env['platform'] == 'windows':
         'user32',
     ])
 
-env.Prepend(LIBS = [glsl, talloc])
+env.Prepend(LIBS = [glsl])
 
 env.Program(
     target = 'glsl2',
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 7c7c7c37c83..ea04fb1a0ee 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -24,8 +24,6 @@ if env['platform'] == 'windows':
     if not env['gles']:
         # prevent _glapi_* from being declared __declspec(dllimport)
         env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
-
-    env.Prepend(CPPPATH = ['#src/talloc'])
 else:
     env.Append(CPPDEFINES = [
         'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)
diff --git a/src/talloc/SConscript b/src/talloc/SConscript
deleted file mode 100644
index 3bf7029bb25..00000000000
--- a/src/talloc/SConscript
+++ /dev/null
@@ -1,20 +0,0 @@
-Import('*')
-
-if env['platform'] != 'windows':
-    Return()
-
-env = env.Clone()
-
-talloc = env.SharedLibrary(
-    target = 'talloc',
-    source = ['talloc.c', 'talloc.def'],
-)
-
-env.InstallSharedLibrary(talloc)
-
-if env['platform'] == 'windows':
-    talloc = env.FindIxes(talloc, 'LIBPREFIX', 'LIBSUFFIX')
-else:
-    talloc = env.FindIxes(talloc, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-
-Export('talloc')
-- 
2.30.2