diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-12-10 20:00:01 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-12-10 20:00:01 +0100 |
| commit | 8424a955b39d55e1f5fc17903507909ba7139dc1 (patch) | |
| tree | cad582fbbd096f21abc4d4fb5053705765d9a914 /recipes/qt4 | |
| parent | 37f8d271e8e4e8ce72378b048a27a5c4fce32ffe (diff) | |
qt 4.6.0: fix packaging a bit
* the uic, moc and rcc tools still need to get packages, but we have package all libs now
Diffstat (limited to 'recipes/qt4')
| -rw-r--r-- | recipes/qt4/qt-4.6.0.inc | 5 | ||||
| -rw-r--r-- | recipes/qt4/qt4.inc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc index c6694f11ce..97ad6cdd74 100644 --- a/recipes/qt4/qt-4.6.0.inc +++ b/recipes/qt4/qt-4.6.0.inc @@ -31,6 +31,11 @@ do_configure_prepend() { QT_GLFLAGS ?= "" QT_CONFIG_FLAGS += "${QT_GLFLAGS}" +do_compile() { + unset CFLAGS CXXFLAGS + oe_runmake ${EXTRA_ENV} +} + do_install_append() { install -d ${D}${bindir} for i in rcc uic moc ; do diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 50dd1d8760..7d600a825c 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -23,7 +23,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ export QT_CONF_PATH="${WORKDIR}/qt.conf" # Library packages -QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon" +QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon QtMultimedia QtOpenVG" QT_EXTRA_LIBS = "pvrQWSWSEGL" |