Changeset 566

Show
Ignore:
Timestamp:
08/25/07 07:09:37 (16 years ago)
Author:
ppalmers
Message:

fix scons problem with PKG_CONFIG_PATH being not set in the calling environment

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/external/dbus/SConscript

    r565 r566  
    88Import( 'env' ) 
    99#dbus_env = env.Copy() 
    10 dbus_env = Environment( ENV = { 'PATH' : os.environ['PATH'], 'PKG_CONFIG_PATH' : os.environ['PKG_CONFIG_PATH'] } ) 
     10buildenv={} 
     11if os.environ.has_key('PATH'): 
     12        buildenv['PATH']=os.environ['PATH'] 
     13else: 
     14        buildenv['PATH']='' 
     15 
     16if os.environ.has_key('PKG_CONFIG_PATH'): 
     17        buildenv['PKG_CONFIG_PATH']=os.environ['PKG_CONFIG_PATH'] 
     18else: 
     19        buildenv['PKG_CONFIG_PATH']='' 
     20 
     21dbus_env = Environment( ENV = buildenv ) 
    1122 
    1223CacheDir( 'cache/objects' ) 

  • trunk/libffado/SConstruct

    r565 r566  
    4343 
    4444## Load the builders in config 
    45 env = Environment( tools=['default','scanreplace','pyuic'], toolpath=['admin'], ENV = { 'PATH' : os.environ['PATH'], 'PKG_CONFIG_PATH' : os.environ['PKG_CONFIG_PATH'] }, options=opts ) 
     45buildenv={} 
     46if os.environ.has_key('PATH'): 
     47        buildenv['PATH']=os.environ['PATH'] 
     48else: 
     49        buildenv['PATH']='' 
     50 
     51if os.environ.has_key('PKG_CONFIG_PATH'): 
     52        buildenv['PKG_CONFIG_PATH']=os.environ['PKG_CONFIG_PATH'] 
     53else: 
     54        buildenv['PKG_CONFIG_PATH']='' 
     55 
     56env = Environment( tools=['default','scanreplace','pyuic'], toolpath=['admin'], ENV = buildenv, options=opts ) 
    4657 
    4758Help( """