diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-01-25 19:26:42 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-03 12:50:01 +0100 |
| commit | c2dc450a2c06fca25234cb2f72b70803432a21e7 (patch) | |
| tree | cf82d530d3703deed43b4a8ddfcdb2761a57f490 | |
| parent | 49dcd3c75b29d0017f4d28436ea18ea69b712b57 (diff) | |
| download | ptxdist-c2dc450a2c06fca25234cb2f72b70803432a21e7.tar.gz ptxdist-c2dc450a2c06fca25234cb2f72b70803432a21e7.tar.xz | |
host-qt4: add option for xmlpatterns
also enable stl. This is needed for future host packages using Qt
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-qt4.in | 7 | ||||
| -rw-r--r-- | rules/host-qt4.make | 18 |
2 files changed, 22 insertions, 3 deletions
diff --git a/rules/host-qt4.in b/rules/host-qt4.in index c149dff4a..13275852a 100644 --- a/rules/host-qt4.in +++ b/rules/host-qt4.in @@ -5,3 +5,10 @@ config HOST_QT4 select HOST_DBUS default ALLYES +if HOST_QT4 + +config HOST_QT4_XMLPATTERNS + bool + +endif + diff --git a/rules/host-qt4.make b/rules/host-qt4.make index 23e7783f8..3a89d6fd8 100644 --- a/rules/host-qt4.make +++ b/rules/host-qt4.make @@ -71,11 +71,9 @@ HOST_QT4_AUTOCONF := \ -no-libjpeg \ -qt-zlib \ -no-freetype \ - -no-stl \ + -stl \ -no-glib \ -dbus \ - -no-xmlpatterns \ - -no-exceptions \ -no-phonon \ -no-phonon-backend \ -no-webkit \ @@ -97,6 +95,12 @@ HOST_QT4_AUTOCONF := \ -no-mouse-qvfb \ -no-mouse-qnx +ifdef PTXCONF_HOST_QT4_XMLPATTERNS +HOST_QT4_AUTOCONF += -xmlpatterns -exceptions +else +HOST_QT4_AUTOCONF += -no-xmlpatterns -no-exceptions +endif + # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- @@ -109,6 +113,10 @@ $(STATEDIR)/host-qt4.compile: sub-xml sub-dbus sub-moc sub-rcc sub-uic @cd $(HOST_QT4_BUILDDIR) && $(HOST_QT4_PATH) $(MAKE) $(PARALLELMFLAGS) \ sub-network +ifdef PTXCONF_HOST_QT4_XMLPATTERNS + @cd $(HOST_QT4_BUILDDIR) && $(HOST_QT4_PATH) $(MAKE) $(PARALLELMFLAGS) \ + sub-xmlpatterns +endif @cd $(HOST_QT4_BUILDDIR)/tools/linguist/lrelease && $(HOST_QT4_PATH) \ $(MAKE) $(PARALLELMFLAGS) @cd $(HOST_QT4_BUILDDIR)/tools/qdbus && $(HOST_QT4_PATH) \ @@ -129,6 +137,10 @@ HOST_QT4_INSTALL_TARGETS := \ sub-rcc-install_subtargets \ sub-uic-install_subtargets +ifdef PTXCONF_HOST_QT4_XMLPATTERNS +HOST_QT4_INSTALL_TARGETS += sub-xmlpatterns-install_subtargets +endif + HOST_QT4_INSTALL_OPT = INSTALL_ROOT=$(HOST_QT4_PKGDIR) $(STATEDIR)/host-qt4.install: |