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