Changeset 2715

Show
Ignore:
Timestamp:
11/06/17 02:20:04 (3 years ago)
Author:
jwoithe
Message:

SConstruct: add byte-string prefix to prevent TypeErrors? in Python3/scons3.

Patch from Orcan Ogetbil.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/SConstruct

    r2713 r2715  
    438438 
    439439if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'): 
    440     env['DBUS1_FLAGS'] = "" 
    441     env['DBUSC1_FLAGS'] = "" 
     440    env['DBUS1_FLAGS'] = b"" 
     441    env['DBUSC1_FLAGS'] = b"" 
    442442    print(""" 
    443443One of the dbus-headers, the dbus-c++-headers and/or the application 
     
    452452    # this is true for DBUS >= 0.96 or so. Since we require >= 1.0 it is 
    453453    # always true 
    454     env['DBUS1_FLAGS'] += " -DDBUS_HAS_THREADS_INIT_DEFAULT" 
     454    env['DBUS1_FLAGS'] += b" -DDBUS_HAS_THREADS_INIT_DEFAULT" 
    455455 
    456456    # The controlserver-glue.h file generated by dbusxx-xml2cpp generates 
     
    459459    # we can do nothing about.  Therefore when compiling dbus-related 
    460460    # code, suppress the "set but not used" warning. 
    461     env['DBUS1_FLAGS'] += " -Wno-unused-but-set-variable" 
     461    env['DBUS1_FLAGS'] += b" -Wno-unused-but-set-variable" 
    462462 
    463463config_guess = conf.ConfigGuess()