From: Vinson Lee <vlee@freedesktop.org>
Date: Thu, 24 May 2012 00:26:20 +0000 (-0700)
Subject: scons: Fix SCons build infrastructure for FreeBSD.
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=5cf693266faebd1fc130709fd7e7b2452bbd156c

scons: Fix SCons build infrastructure for FreeBSD.

This patch gets the FreeBSD SCons build working again. The build still
fails though.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/common.py b/common.py
index f0b1ccc2c1f..6121a411403 100644
--- a/common.py
+++ b/common.py
@@ -89,7 +89,7 @@ def AddOptions(opts):
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
 											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
 	opts.Add(EnumOption('platform', 'target platform', host_platform,
-											 allowed_values=('linux', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8', 'haiku')))
+											 allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku', 'linux', 'sunos', 'windows')))
 	opts.Add(BoolOption('embedded', 'embedded build', 'no'))
 	opts.Add('toolchain', 'compiler toolchain', default_toolchain)
 	opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no'))
diff --git a/src/SConscript b/src/SConscript
index e4cda2fd03e..3d0087887f4 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,7 +22,7 @@ SConscript('mesa/SConscript')
 SConscript('mapi/vgapi/SConscript')
 
 if not env['embedded']:
-    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'windows'):
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
         SConscript('glx/SConscript')
     if env['platform'] not in ['darwin', 'haiku', 'sunos']:
         SConscript('egl/main/SConscript')
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index e212ed184cf..f281f4c6567 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -124,7 +124,7 @@ SConscript([
 ])
 
 if not env['embedded']:
-    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
         SConscript([
             'targets/egl-static/SConscript'
         ])
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index e9c274059bd..7b1cc8c86fb 100644
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ b/src/gallium/winsys/sw/xlib/SConscript
@@ -4,7 +4,7 @@
 
 Import('*')
 
-if env['platform'] in ('cygwin', 'linux', 'sunos'):
+if env['platform'] in ('cygwin', 'freebsd', 'linux', 'sunos'):
 
     env = env.Clone()