[oe-commits] Koen Kooi : qt 4.6.0: fix packaging a bit
git version control
git at git.openembedded.org
Sun Dec 13 12:26:36 UTC 2009
Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 8424a955b39d55e1f5fc17903507909ba7139dc1
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8424a955b39d55e1f5fc17903507909ba7139dc1
Author: Koen Kooi <koen at openembedded.org>
Date: Thu Dec 10 20:00:01 2009 +0100
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
---
recipes/qt4/qt-4.6.0.inc | 5 +++++
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 c6694f1..97ad6cd 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 50dd1d8..7d600a8 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"
More information about the Openembedded-commits
mailing list