diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-14 10:53:06 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-02-14 18:19:24 +0100 |
commit | e6e464c9ed9266ce46452f953c1bdcb0e7b2d95f (patch) | |
tree | fcdf0713ca300362d754ce0bb9ac78ba892a09b7 | |
parent | f53015678f22615eb5a23b093496ea9c63927812 (diff) | |
download | meta-qt5-upstream/thud-next.tar.gz |
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURESupstream/thud-nextupstream/thudupstream/jansa/thud
* 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 2835ab70..8ab1746a 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -64,7 +64,7 @@ QT_CONFIG_FLAGS_GOLD_x86 = "-no-use-gold-linker" | |||
64 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 64 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
65 | 65 | ||
66 | # separate some parts of PACKAGECONFIG which are often changed | 66 | # separate some parts of PACKAGECONFIG which are often changed |
67 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" | 67 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}" |
68 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 68 | PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
69 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}" | 69 | PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}" |
70 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite openssl', '', d)}" | 70 | PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite openssl', '', d)}" |