summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase_git.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 9c55997f..c0bcd817 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -31,10 +31,6 @@ DEPENDS += "qtbase-native"
31RDEPENDS_${PN}-tools += "perl" 31RDEPENDS_${PN}-tools += "perl"
32 32
33# separate some parts of PACKAGECONFIG which are often changed 33# separate some parts of PACKAGECONFIG which are often changed
34# be aware that you need to add icu to build qtwebkit, default
35# PACKAGECONFIG is kept rather minimal for people who don't need
36# stuff like webkit (and it's easier to add options than remove)
37
38PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" 34PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
39PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 35PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
40PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}" 36PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}"
@@ -114,7 +110,6 @@ PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
114PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" 110PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
115PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" 111PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl"
116PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa" 112PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa"
117# needed for qtwebkit
118PACKAGECONFIG[icu] = "-icu,-no-icu,icu" 113PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
119PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" 114PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
120PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 115PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
@@ -133,6 +128,9 @@ QT_CONFIG_FLAGS += " \
133" 128"
134 129
135do_configure() { 130do_configure() {
131 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration
132 touch ${S}/mkspecs/oe-device-extra.pri
133
136 ${S}/configure -v \ 134 ${S}/configure -v \
137 -opensource -confirm-license \ 135 -opensource -confirm-license \
138 -sysroot ${STAGING_DIR_TARGET} \ 136 -sysroot ${STAGING_DIR_TARGET} \