diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-17 14:19:31 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-17 14:19:31 +0400 |
| commit | d6573b8bf03ea7b7789ac3977820706cb779c815 (patch) | |
| tree | 17fb78ec58b30893c2c916afa7710bfcd67a5db3 /recipes/qt4/qt4.inc | |
| parent | 54dfc8da23a6990dc84f5de94968e4b212447594 (diff) | |
| parent | 88290161c02e7dc418f43202ccd92334a42e70e7 (diff) | |
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
Diffstat (limited to 'recipes/qt4/qt4.inc')
| -rw-r--r-- | recipes/qt4/qt4.inc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 42e2726e5a..9d82a1bc0c 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -24,6 +24,9 @@ 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_EXTRA_LIBS = "pvrQWSWSEGL" + python __anonymous () { import bb @@ -48,6 +51,20 @@ python __anonymous () { for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split(): dbg_packages.append("%s-dbg" % name) + for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split(): + pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4" + bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d) + bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl + ${libdir}/lib%(name)s.a + ${libdir}/lib%(name)s.la + ${libdir}/lib%(name)s.so + ${includedir}/${QT_DIR_NAME}/%(incname)s + ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d) + bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d) + lib_packages.append(pkg) + dev_packages.append("%s-dev" % pkg) + dbg_packages.append("%s-dbg" % pkg) + bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d) bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d) bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d) |