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 f0b1ccc2c1f07ef10a65839ef486c692e82bd889..6121a41140338bfc4a3fd7b78bf3f7769e60b5bb 100644 (file)
--- 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,
        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'))
        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 e4cda2fd03e0dd203bcfc1264b343b9da1132db7..3d0087887f4b047e2b70308a1e7db4e18ccb4051 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -22,7 +22,7 @@ SConscript('mesa/SConscript')
 SConscript('mapi/vgapi/SConscript')
 
 if not env['embedded']:
 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')
         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 e212ed184cf26e9b4fc70ef407c6a7ad927825a4..f281f4c6567dc39f37dc0f160ccf8a145415e63c 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -124,7 +124,7 @@ SConscript([
 ])
 
 if not env['embedded']:
 ])
 
 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'
         ])
         SConscript([
             'targets/egl-static/SConscript'
         ])

diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index e9c274059bd62ac790c4e904a96c6f6cc35375c6..7b1cc8c86fbd6414e59bbabcdf2ad6d8c95663e1 100644 (file)
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ b/src/gallium/winsys/sw/xlib/SConscript
@@ -4,7 +4,7 @@
 
 Import('*')
 
 
 Import('*')
 

-if env['platform'] in ('cygwin', 'linux', 'sunos'):
+if env['platform'] in ('cygwin', 'freebsd', 'linux', 'sunos'):

 
     env = env.Clone()
 
 
     env = env.Clone()