X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=scons%2Fgallium.py;h=34523d5898b57ff6d1f03b690e895e841c1a4d64;hb=cf143c1f4d7c3636ddd5c767518b1b00ff46b16c;hp=03856207ed0a260b2f52092355ebdd61e1cfe3fc;hpb=9b346f83a7b672e913a7bb6a089d5dbd7fbdce06;p=mesa.git diff --git a/scons/gallium.py b/scons/gallium.py old mode 100644 new mode 100755 index 03856207ed0..34523d5898b --- a/scons/gallium.py +++ b/scons/gallium.py @@ -35,6 +35,7 @@ import os import os.path import re import subprocess +import platform as _platform import SCons.Action import SCons.Builder @@ -49,30 +50,35 @@ def symlink(target, source, env): os.symlink(os.path.basename(source), target) def install(env, source, subdir): - target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], subdir) - env.Install(target_dir, source) + target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build_dir'], subdir) + return env.Install(target_dir, source) def install_program(env, source): - install(env, source, 'bin') + return install(env, source, 'bin') def install_shared_library(env, sources, version = ()): - install_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build']) + targets = [] + install_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build_dir']) version = tuple(map(str, version)) if env['SHLIBSUFFIX'] == '.dll': dlls = env.FindIxes(sources, 'SHLIBPREFIX', 'SHLIBSUFFIX') - install(env, dlls, 'bin') + targets += install(env, dlls, 'bin') libs = env.FindIxes(sources, 'LIBPREFIX', 'LIBSUFFIX') - install(env, libs, 'lib') + targets += install(env, libs, 'lib') else: for source in sources: target_dir = os.path.join(install_dir, 'lib') target_name = '.'.join((str(source),) + version) last = env.InstallAs(os.path.join(target_dir, target_name), source) + targets += last while len(version): version = version[:-1] target_name = '.'.join((str(source),) + version) action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE") last = env.Command(os.path.join(target_dir, target_name), last, action) + targets += last + return targets + def createInstallMethods(env): env.AddMethod(install_program, 'InstallProgram') @@ -98,9 +104,48 @@ def num_jobs(): return 1 +def pkg_config_modules(env, name, modules): + '''Simple wrapper for pkg-config.''' + + env[name] = False + + if env['platform'] == 'windows': + return + + if not env.Detect('pkg-config'): + return + + if subprocess.call(["pkg-config", "--exists", ' '.join(modules)]) != 0: + return + + # Put -I and -L flags directly into the environment, as these don't affect + # the compilation of targets that do not use them + try: + env.ParseConfig('pkg-config --cflags-only-I --libs-only-L ' + ' '.join(modules)) + except OSError: + return + + # Other flags may affect the compilation of unrelated targets, so store + # them with a prefix, (e.g., XXX_CFLAGS, XXX_LIBS, etc) + try: + flags = env.ParseFlags('!pkg-config --cflags-only-other --libs-only-l --libs-only-other ' + ' '.join(modules)) + except OSError: + return + prefix = name.upper() + '_' + for flag_name, flag_value in flags.iteritems(): + env[prefix + flag_name] = flag_value + + env[name] = True + + + def generate(env): """Common environment generation code""" + # Tell tools which machine to compile for + env['TARGET_ARCH'] = env['machine'] + env['MSVS_ARCH'] = env['machine'] + # Toolchain platform = env['platform'] if env['toolchain'] == 'default': @@ -110,14 +155,36 @@ def generate(env): env['toolchain'] = 'wcesdk' env.Tool(env['toolchain']) + # Allow override compiler and specify additional flags from environment if os.environ.has_key('CC'): env['CC'] = os.environ['CC'] + # Update CCVERSION to match + pipe = SCons.Action._subproc(env, [env['CC'], '--version'], + stdin = 'devnull', + stderr = 'devnull', + stdout = subprocess.PIPE) + if pipe.wait() == 0: + line = pipe.stdout.readline() + match = re.search(r'[0-9]+(\.[0-9]+)+', line) + if match: + env['CCVERSION'] = match.group(0) + if os.environ.has_key('CFLAGS'): + env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) + if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] + if os.environ.has_key('CXXFLAGS'): + env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) + if os.environ.has_key('LDFLAGS'): + env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-') env['msvc'] = env['CC'] == 'cl' + if env['msvc'] and env['toolchain'] == 'default' and env['machine'] == 'x86_64': + # MSVC x64 support is broken in earlier versions of scons + env.EnsurePythonVersion(2, 0) + # shortcuts - debug = env['debug'] machine = env['machine'] platform = env['platform'] x86 = env['machine'] == 'x86' @@ -125,24 +192,73 @@ def generate(env): gcc = env['gcc'] msvc = env['msvc'] + # Determine whether we are cross compiling; in particular, whether we need + # to compile code generators with a different compiler as the target code. + host_platform = _platform.system().lower() + if host_platform.startswith('cygwin'): + host_platform = 'cygwin' + host_machine = os.environ.get('PROCESSOR_ARCHITEW6432', os.environ.get('PROCESSOR_ARCHITECTURE', _platform.machine())) + host_machine = { + 'x86': 'x86', + 'i386': 'x86', + 'i486': 'x86', + 'i586': 'x86', + 'i686': 'x86', + 'ppc' : 'ppc', + 'AMD64': 'x86_64', + 'x86_64': 'x86_64', + }.get(host_machine, 'generic') + env['crosscompile'] = platform != host_platform + if machine == 'x86_64' and host_machine != 'x86_64': + env['crosscompile'] = True + env['hostonly'] = False + + # Backwards compatability with the debug= profile= options + if env['build'] == 'debug': + if not env['debug']: + print 'scons: warning: debug option is deprecated and will be removed eventually; use instead' + print + print ' scons build=release' + print + env['build'] = 'release' + if env['profile']: + print 'scons: warning: profile option is deprecated and will be removed eventually; use instead' + print + print ' scons build=profile' + print + env['build'] = 'profile' + if False: + # Enforce SConscripts to use the new build variable + env.popitem('debug') + env.popitem('profile') + else: + # Backwards portability with older sconscripts + if env['build'] in ('debug', 'checked'): + env['debug'] = True + env['profile'] = False + if env['build'] == 'profile': + env['debug'] = False + env['profile'] = True + if env['build'] == 'release': + env['debug'] = False + env['profile'] = False + # Put build output in a separate dir, which depends on the current # configuration. See also http://www.scons.org/wiki/AdvancedBuildExample build_topdir = 'build' build_subdir = env['platform'] - if env['llvm']: - build_subdir += "-llvm" if env['machine'] != 'generic': build_subdir += '-' + env['machine'] - if env['debug']: - build_subdir += "-debug" - if env['profile']: - build_subdir += "-profile" + if env['build'] != 'release': + build_subdir += '-' + env['build'] build_dir = os.path.join(build_topdir, build_subdir) # Place the .sconsign file in the build dir too, to avoid issues with # different scons versions building the same source file - env['build'] = build_dir + env['build_dir'] = build_dir env.SConsignFile(os.path.join(build_dir, '.sconsign')) - env.CacheDir('build/cache') + if 'SCONS_CACHE_DIR' in os.environ: + print 'scons: Using build cache in %s.' % (os.environ['SCONS_CACHE_DIR'],) + env.CacheDir(os.environ['SCONS_CACHE_DIR']) env['CONFIGUREDIR'] = os.path.join(build_dir, 'conf') env['CONFIGURELOG'] = os.path.join(os.path.abspath(build_dir), 'config.log') @@ -150,13 +266,16 @@ def generate(env): if env.GetOption('num_jobs') <= 1: env.SetOption('num_jobs', num_jobs()) + env.Decider('MD5-timestamp') + env.SetOption('max_drift', 60) + # C preprocessor options cppdefines = [] - if debug: + if env['build'] in ('debug', 'checked'): cppdefines += ['DEBUG'] else: cppdefines += ['NDEBUG'] - if env['profile']: + if env['build'] == 'profile': cppdefines += ['PROFILE'] if platform == 'windows': cppdefines += [ @@ -164,8 +283,9 @@ def generate(env): '_WINDOWS', #'_UNICODE', #'UNICODE', - ('_WIN32_WINNT', '0x0501'), # minimum required OS version - ('WINVER', '0x0501'), + # http://msdn.microsoft.com/en-us/library/aa383745.aspx + ('_WIN32_WINNT', '0x0601'), + ('WINVER', '0x0601'), ] if msvc and env['toolchain'] != 'winddk': cppdefines += [ @@ -176,7 +296,7 @@ def generate(env): '_SCL_SECURE_NO_WARNINGS', '_SCL_SECURE_NO_DEPRECATE', ] - if debug: + if env['build'] in ('debug', 'checked'): cppdefines += ['_DEBUG'] if env['toolchain'] == 'winddk': # Mimic WINDDK's builtin flags. See also: @@ -203,7 +323,7 @@ def generate(env): ('__BUILDMACHINE__', 'WinDDK'), ('FPO', '0'), ] - if debug: + if env['build'] in ('debug', 'checked'): cppdefines += [('DBG', 1)] if platform == 'wince': cppdefines += [ @@ -230,7 +350,7 @@ def generate(env): cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE'] cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_CE_OGL'] if platform == 'embedded': - cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED'] + cppdefines += ['PIPE_OS_EMBEDDED'] env.Append(CPPDEFINES = cppdefines) # C compiler options @@ -238,25 +358,17 @@ def generate(env): cxxflags = [] # C++ ccflags = [] # C & C++ if gcc: - ccversion = '' - pipe = SCons.Action._subproc(env, [env['CC'], '--version'], - stdin = 'devnull', - stderr = 'devnull', - stdout = subprocess.PIPE) - if pipe.wait() == 0: - line = pipe.stdout.readline() - match = re.search(r'[0-9]+(\.[0-9]+)+', line) - if match: - ccversion = match.group(0) - if debug: - ccflags += ['-O0', '-g3'] + ccversion = env['CCVERSION'] + if env['build'] == 'debug': + ccflags += ['-O0'] elif ccversion.startswith('4.2.'): # gcc 4.2.x optimizer is broken print "warning: gcc 4.2.x optimizer is broken -- disabling optimizations" - ccflags += ['-O0', '-g3'] + ccflags += ['-O0'] else: - ccflags += ['-O3', '-g3'] - if env['profile']: + ccflags += ['-O3'] + ccflags += ['-g3'] + if env['build'] in ('checked', 'profile'): # See http://code.google.com/p/jrfonseca/wiki/Gprof2Dot#Which_options_should_I_pass_to_gcc_when_compiling_for_profiling? ccflags += [ '-fno-omit-frame-pointer', @@ -266,25 +378,35 @@ def generate(env): ccflags += [ '-m32', #'-march=pentium4', - #'-mfpmath=sse', ] - if platform != 'windows': - # XXX: -mstackrealign causes stack corruption on MinGW. Ditto - # for -mincoming-stack-boundary=2. Still enable it on other - # platforms for now, but we can't rely on it for cross platform - # code. We have to use __attribute__((force_align_arg_pointer)) - # instead. + if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2') \ + and (platform != 'windows' or env['build'] == 'debug' or True): + # NOTE: We need to ensure stack is realigned given that we + # produce shared objects, and have no control over the stack + # alignment policy of the application. Therefore we need + # -mstackrealign ore -mincoming-stack-boundary=2. + # + # XXX: -O and -mstackrealign causes stack corruption on MinGW + # + # XXX: We could have SSE without -mstackrealign if we always used + # __attribute__((force_align_arg_pointer)), but that's not + # always the case. ccflags += [ - '-mmmx', '-msse', '-msse2', # enable SIMD intrinsics '-mstackrealign', # ensure stack is aligned + '-mmmx', '-msse', '-msse2', # enable SIMD intrinsics + #'-mfpmath=sse', ] + if platform in ['windows', 'darwin']: + # Workaround http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37216 + ccflags += ['-fno-common'] if env['machine'] == 'x86_64': ccflags += ['-m64'] + if platform == 'darwin': + ccflags += ['-fno-common'] # See also: # - http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html ccflags += [ '-Wall', - '-Wmissing-field-initializers', '-Wno-long-long', '-ffast-math', '-fmessage-length=0', # be nice to Eclipse @@ -293,29 +415,39 @@ def generate(env): '-Wmissing-prototypes', '-std=gnu99', ] + if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.0'): + ccflags += [ + '-Wmissing-field-initializers', + ] if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2'): - ccflags += [ - '-Werror=pointer-arith', - ] - cflags += [ - '-Werror=declaration-after-statement', - ] + ccflags += [ + '-Werror=pointer-arith', + ] + cflags += [ + '-Werror=declaration-after-statement', + ] if msvc: # See also: # - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx # - cl /? - if debug: + if env['build'] == 'debug': ccflags += [ '/Od', # disable optimizations '/Oi', # enable intrinsic functions '/Oy-', # disable frame pointer omission - '/GL-', # disable whole program optimization ] else: ccflags += [ '/O2', # optimize for speed + ] + if env['build'] == 'release': + ccflags += [ '/GL', # enable whole program optimization ] + else: + ccflags += [ + '/GL-', # disable whole program optimization + ] ccflags += [ '/fp:fast', # fast floating point '/W3', # warning level @@ -373,7 +505,7 @@ def generate(env): if env['platform'] == 'windows' and msvc: # Choose the appropriate MSVC CRT # http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx - if env['debug']: + if env['build'] in ('debug', 'checked'): env.Append(CCFLAGS = ['/MTd']) env.Append(SHCCFLAGS = ['/LDd']) else: @@ -405,7 +537,7 @@ def generate(env): else: env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group' if msvc: - if not env['debug']: + if env['build'] == 'release': # enable Link-time Code Generation linkflags += ['/LTCG'] env.Append(ARFLAGS = ['/LTCG']) @@ -444,7 +576,7 @@ def generate(env): '/entry:DrvEnableDriver', ] - if env['debug'] or env['profile']: + if env['build'] != 'release': linkflags += [ '/MAP', # http://msdn.microsoft.com/en-us/library/k7xkk3e2.aspx ] @@ -458,9 +590,29 @@ def generate(env): env.Append(LINKFLAGS = linkflags) env.Append(SHLINKFLAGS = shlinkflags) + # We have C++ in several libraries, so always link with the C++ compiler + if env['gcc']: + env['LINK'] = env['CXX'] + # Default libs env.Append(LIBS = []) + # Load tools + env.Tool('lex') + env.Tool('yacc') + if env['llvm']: + env.Tool('llvm') + env.Tool('udis86') + + pkg_config_modules(env, 'x11', ['x11', 'xext']) + pkg_config_modules(env, 'drm', ['libdrm']) + pkg_config_modules(env, 'drm_intel', ['libdrm_intel']) + pkg_config_modules(env, 'drm_radeon', ['libdrm_radeon']) + pkg_config_modules(env, 'xorg', ['xorg-server']) + pkg_config_modules(env, 'kms', ['libkms']) + + env['dri'] = env['x11'] and env['drm'] + # Custom builders and methods env.Tool('custom') createInstallMethods(env)