diff options
| author | Matt Hoosier <matt.hoosier@garmin.com> | 2017-08-17 07:27:33 -0500 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 13:04:02 +0200 |
| commit | 3522d3dca07494fa2bd060d53c53081d8483b910 (patch) | |
| tree | 1675f13b7f9f9c64b12ff8209299949c3203149f | |
| parent | 142f8880b5d18ed90cf0c34a0c970379ff769e47 (diff) | |
qtbase: fix Krogoth build regression from efa8aaf
With
commit efa8aaf82e580a7d32eaaab48eb92d436f2e222a
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 a17ff281aa8d99f770b0a049cb798235005fb93e
at https://codereview.qt-project.org/yocto/meta-qt5.)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 0f1c6d6c..6f334c12 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -97,7 +97,7 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { ${S}/configure -v \ diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 2420580b..c8bf0083 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -82,7 +82,7 @@ PACKAGECONFIG_CONFARGS = " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2115557f..8cd23a02 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -141,7 +141,7 @@ QT_CONFIG_FLAGS += " \ # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file -export OE_QMAKE_QTCONF_PATH = "foodummy" +deltask generate_qt_config_file do_configure() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration |