diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-14 10:53:06 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-14 10:53:07 +0000 |
| commit | cad5f8c8de8b60512cfbf1a455895e10ed1304aa (patch) | |
| tree | d283153064ace3e811149b501ac068c138155855 | |
| parent | 44aab3a0413da7d8f061497eb192b62c1bce4f4e (diff) | |
| download | meta-qt5-cad5f8c8de8b60512cfbf1a455895e10ed1304aa.tar.gz | |
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
* otherwise building qtbase with default config will fail with:
ERROR: The OpenGL functionality tests failed!
You might need to modify the include and library search paths by editing
QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2]
in the mkspec for your platform.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0ccba7cb..9183ecf6 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -38,7 +38,7 @@ SRC_URI += "\ | |||
| 38 | RDEPENDS_${PN}-tools += "perl" | 38 | RDEPENDS_${PN}-tools += "perl" |
| 39 | 39 | ||
| 40 | # separate some parts of PACKAGECONFIG which are often changed | 40 | # separate some parts of PACKAGECONFIG which are often changed |
| 41 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 41 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}" |
| 42 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 42 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
| 43 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}" | 43 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}" |
| 44 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite openssl', '', d)}" | 44 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite openssl', '', d)}" |