From 6ec88245642cfe16bdd21abdbb8f3fabe13c96b9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 22 Feb 2014 14:18:06 +0100 Subject: [PATCH] qtbase: Fix PACKAGECONFIG[tests] * at least in 5.2.1 tests aren't enabled by default: QT_ALL_BUILD_PARTS=" libs tools examples tests " QT_DEFAULT_BUILD_PARTS="libs tools examples" so without -make option they weren't enabled even with tests in PACKAGECONFIG * add options for other build parts just for completeness Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 6c477304b3..378f229b40 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -44,7 +44,7 @@ PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_RELEASE ?= "release" # This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency # PACKAGECONFIG_OPENSSL ?= "openssl" -PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets" +PACKAGECONFIG_DEFAULT ?= "dbus udev evdev widgets tools libs" PACKAGECONFIG ?= " \ ${PACKAGECONFIG_RELEASE} \ @@ -62,8 +62,11 @@ PACKAGECONFIG ?= " \ PACKAGECONFIG[release] = "-release,-debug" PACKAGECONFIG[developer] = "-developer-build" PACKAGECONFIG[sm] = "-sm,-no-sm" -PACKAGECONFIG[tests] = ",-nomake tests" -PACKAGECONFIG[examples] = ",-nomake examples" +PACKAGECONFIG[tests] = "-make tests,-nomake tests" +PACKAGECONFIG[examples] = "-make examples,-nomake examples" +PACKAGECONFIG[tools] = "-make tools,-nomake tools" +# only for completeness, configure will add libs even if you try to explicitly remove it +PACKAGECONFIG[libs] = "-make libs,-nomake libs" # accessibility is required to compile qtquickcontrols PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0"