Ticket #214: scons-fix.patch

File scons-fix.patch, 5.3 kB (added by adi, 3 years ago)

  • SConstruct

    old new  
    4343if not os.path.isdir( "cache" ): 
    4444        os.makedirs( "cache" ) 
    4545 
    46 opts = Options( "cache/"+build_base+"options.cache" ) 
     46opts = Variables( "cache/"+build_base+"options.cache" ) 
    4747 
    4848# 
    4949# If this is just to display a help-text for the variable used via ARGUMENTS, then its wrong... 
    5050opts.Add( "BUILDDIR", "Path to place the built files in", "") 
    5151 
    52 opts.AddOptions( 
    53         BoolOption( "DEBUG", """\ 
     52opts.AddVariables( 
     53        BoolVariable( "DEBUG", """\ 
    5454Toggle debug-build. DEBUG means \"-g -Wall\" and more, otherwise we will use 
    5555  \"-O2\" to optimize.""", True ), 
    56         BoolOption( "PROFILE", "Build with symbols and other profiling info", False ), 
    57         PathOption( "PREFIX", "The prefix where ffado will be installed to.", "/usr/local", PathOption.PathAccept ), 
    58         PathOption( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathOption.PathAccept ), 
    59         PathOption( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathOption.PathAccept ), 
    60         PathOption( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathOption.PathAccept ), 
    61         PathOption( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathOption.PathAccept ), 
    62         BoolOption( "ENABLE_BEBOB", "Enable/Disable the bebob part.", True ), 
    63         BoolOption( "ENABLE_FIREWORKS", "Enable/Disable the ECHO Audio FireWorks AV/C part.", True ), 
    64         BoolOption( "ENABLE_OXFORD", "Enable/Disable support for the Oxford Semiconductor AV/C platform.", True ), 
    65         BoolOption( "ENABLE_MOTU", "Enable/Disable the MOTU part.", True ), 
    66         BoolOption( "ENABLE_DICE", "Enable/Disable the DICE part.", True ), 
    67         BoolOption( "ENABLE_METRIC_HALO", "Enable/Disable the Metric Halo part.", False ), 
    68         BoolOption( "ENABLE_RME", "Enable/Disable the RME part.", False ), 
    69         #BoolOption( "ENABLE_BOUNCE", "Enable/Disable the BOUNCE part.", False ), 
    70         BoolOption( "ENABLE_GENERICAVC", """\ 
     56        BoolVariable( "PROFILE", "Build with symbols and other profiling info", False ), 
     57        PathVariable( "PREFIX", "The prefix where ffado will be installed to.", "/usr/local", PathVariable.PathAccept ), 
     58        PathVariable( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathVariable.PathAccept ), 
     59        PathVariable( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathVariable.PathAccept ), 
     60        PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ), 
     61        PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ), 
     62        BoolVariable( "ENABLE_BEBOB", "Enable/Disable the bebob part.", True ), 
     63        BoolVariable( "ENABLE_FIREWORKS", "Enable/Disable the ECHO Audio FireWorks AV/C part.", True ), 
     64        BoolVariable( "ENABLE_OXFORD", "Enable/Disable support for the Oxford Semiconductor AV/C platform.", True ), 
     65        BoolVariable( "ENABLE_MOTU", "Enable/Disable the MOTU part.", True ), 
     66        BoolVariable( "ENABLE_DICE", "Enable/Disable the DICE part.", True ), 
     67        BoolVariable( "ENABLE_METRIC_HALO", "Enable/Disable the Metric Halo part.", False ), 
     68        BoolVariable( "ENABLE_RME", "Enable/Disable the RME part.", False ), 
     69        #BoolVariable( "ENABLE_BOUNCE", "Enable/Disable the BOUNCE part.", False ), 
     70        BoolVariable( "ENABLE_GENERICAVC", """\ 
    7171Enable/Disable the the generic avc part (mainly used by apple). 
    7272  Note that disabling this option might be overwritten by other devices needing 
    7373  this code.""", False ), 
    74         BoolOption( "ENABLE_ALL", "Enable/Disable support for all devices.", False ), 
    75         BoolOption( "SERIALIZE_USE_EXPAT", "Use libexpat for XML serialization.", False ), 
    76         BoolOption( "BUILD_TESTS", """\ 
     74        BoolVariable( "ENABLE_ALL", "Enable/Disable support for all devices.", False ), 
     75        BoolVariable( "SERIALIZE_USE_EXPAT", "Use libexpat for XML serialization.", False ), 
     76        BoolVariable( "BUILD_TESTS", """\ 
    7777Build the tests in their directory. As some contain quite some functionality, 
    7878  this is on by default. 
    7979  If you just want to use ffado with jack without the tools, you can disable this.\ 
    8080""", True ), 
    81     BoolOption( "BUILD_STATIC_TOOLS", "Build a statically linked version of the FFADO tools.", False ), 
    82     EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2), 
    83     BoolOption( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ), 
    84         BoolOption( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ), 
     81    BoolVariable( "BUILD_STATIC_TOOLS", "Build a statically linked version of the FFADO tools.", False ), 
     82    EnumVariable('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2), 
     83    BoolVariable( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ), 
     84        BoolVariable( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ), 
    8585 
    8686        ) 
    8787