diff options
| author |   Chase Maupin <chasemaupin03@gmail.com> | 2010-10-12 03:25:13 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@openembedded.org> | 2010-10-19 16:59:26 +0200 |
| commit | 019cddea9eea3f4b1239d55ecce7c02f72268122 (patch) | |
| tree | f298c8b670a5bd28d06081e3daa906b4e1b9069f /recipes/qt4 | |
| parent | 29ed2a74ff82f77a683ba3361db3a87d68329298 (diff) | |
| download | openembedded-019cddea9eea3f4b1239d55ecce7c02f72268122.tar.gz | |
qt4: replace underscore with dash in library name
* For libraries that are added to the QT_LIB_NAMES or
QT_EXTRA_LIBS variables replace any "_" characters in the
library name with "-" for use in the package name.
* The actual library file names are left alone.
* Bump the PR for packages using qt4.inc
Signed-off-by: Chase Maupin <chase.maupin@ti.com>
Acked-by: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Signed-off-by: Koen Kooi <koen@openembedded.org>
Diffstat (limited to 'recipes/qt4')
| -rw-r--r-- | recipes/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4.inc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 111716d83b..9331302f28 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -4,7 +4,7 @@ LICENSE = "GPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" -INC_PR = "r23" +INC_PR = "r24" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index 66e6d1c172..ff4e4547a0 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r20" +INC_PR = "r21" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch \ diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index ffd56dd4c0..6721265570 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -34,7 +34,7 @@ python __anonymous () { dev_packages = [] dbg_packages = [] for name in bb.data.getVar("QT_LIB_NAMES", d, 1).split(): - pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4" + pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "4" # NOTE: the headers for QtAssistantClient are different incname = name.replace("QtAssistantClient", "QtAssistant") bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d) @@ -52,7 +52,7 @@ python __anonymous () { 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" + pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "").replace("_", "-") + "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 |