Commits on Aug 15, 2017

1. qtbase: fix Krogoth build regression from efa8aaf …

   With
   
       commit efa8aaf
       Author: Andreas Müller <schnitzeltony@googlemail.com>
       Date:   Thu Feb  9 00:26:09 2017
   
       qmake5_base.bbclass: set qt.conf by environment variable again
   
   we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and
   instead directed it to a path which was intended not to exist.
   
   The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase
   to build again after Qt 5.8 started paying attention to the
   contents of this file.
   
   The change as done in efa8aaf works well enough for Morty and
   subsequent releases' copies of Bitbake, but fails on earlier
   releases because they lack the following change:
   
       commit 2afcbfef2cd1ca568e5225884a8021df38ee3db0
       Author: Ross Burton <ross.burton@intel.com>
       Date: 2016-07-14 13:56:22
   
       bitbake: build: don't use $B as the default cwd for functions
   
   The result is that when we build with Krogoth or prior, the body
   of do_generate_qt_config_file() runs with a cwd of ${B}, which was
   _not_ the intent of efa8aaf. Because the working directory is ${B},
   ${OE_QMAKE_QTCONF_PATH} is written in there too. do_configure() --
   whose cwd is by design also ${B} -- then finds the file 'foodummy',
   and the build breaks for the reasons outlined in efa8aaf.
   
   This change simply shifts the implementation tactics to suppress
   the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely
   on unspecified behavior about the cwd of do_generate_qt_config_file().
   
   (cherry picked from commit a17ff28
   at https://codereview.qt-project.org/yocto/meta-qt5.)

   

   matthoosier-garmin authored and matthoosier committed Aug 15, 2017
   Configuration menu

   • View commit details
   • Copy full SHA for 1c0e8ba
   • Browse repository at this point

   Copy the full SHA

   1c0e8ba View commit details

   Browse the repository at this point in the history