Skip to contentSkip to conversation

qtbase: Move remaining few by default enabled options to PACKAGECONFIG_DEFAULT

PATCH New Martin Jansa 1 participant 2 messages Feb 22, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 qtbase: Move remaining few by default enabled options to PACKAGECONFIG_DEFAULT

* more and more people don't want to redefine whole PACKAGECONFIG variable

---
 recipes-qt/qt5/qtbase.inc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
recipes-qt/qt5/qtbase.inc +3 -5
index d8ad4da..6c47730 100644
@@ -44,13 +44,11 @@ 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 ??= " \
+PACKAGECONFIG ?= " \
     ${PACKAGECONFIG_RELEASE} \
-    dbus \
-    udev \
-    evdev \
-    widgets \
+    ${PACKAGECONFIG_DEFAULT} \
     ${PACKAGECONFIG_OPENSSL} \
     ${PACKAGECONFIG_GL} \
     ${PACKAGECONFIG_FB} \
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 2/2 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

---
 recipes-qt/qt5/qtbase.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
recipes-qt/qt5/qtbase.inc +6 -3
index 6c47730..378f229 100644
@@ -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"
Signature · 1 line
1.8.5.3