Changeset 2725

Show
Ignore:
Timestamp:
01/05/18 01:40:19 (6 months ago)
Author:
jwoithe
Message:

SCons: fix detection of dbus on PyQt?5 systems.

The detection of the dbus python modules was qualified on the presence of
pyuic4. On systems with only PyQt?5 this would obviously fail. Patch from
Orcan Ogetbil via the ffado-devel mailing list.

r2724 inadvertently included a change to SConstruct to import sys. This is
needed since sys.stdout is referenced in some situations (in particular, if
jack is not installed in the build environment). This patch was also from
Orcan Ogetbil, via the ffado-devel mailing list.

Files:

Legend:

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

    r2724 r2725  
    397397# PyQT checks 
    398398if env['BUILD_MIXER'] != 'false': 
    399     have_dbus = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) 
     399    have_dbus = ((conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' )) or (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'dbus.mainloop.pyqt5' ))) 
    400400    have_pyqt4 = (conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'PyQt4' )) 
    401401    have_pyqt5 = (conf.CheckForApp( 'which pyuic5' ) and conf.CheckForPyModule( 'PyQt5' ))