summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-14 14:46:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-15 13:33:51 (GMT)
commit82b6146ef29f06bb2ded19aa320b1933e1560fe5 (patch)
treef07d8be00cd96acf719036fefeb5cb966c6e4172 /meta/recipes-qt
parent93453f408bab7f2c127fce2bc09c2a974d64e86e (diff)
downloadpoky-82b6146ef29f06bb2ded19aa320b1933e1560fe5.tar.gz
qt4: package static libraries correctly to fix warnings
WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a' WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a' (From OE-Core rev: d4f1ef6b8297826230a68e535098709d07de1f48) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc19
2 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 56f349a..e1bef64 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r39" 8INC_PR = "r40"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 77fb06f..7f1f6f0 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -45,30 +45,33 @@ python __anonymous () {
45 lib_packages = [] 45 lib_packages = []
46 dev_packages = [] 46 dev_packages = []
47 dbg_packages = [] 47 dbg_packages = []
48 staticdev_packages = []
48 for name in d.getVar("QT_LIB_NAMES", True).split(): 49 for name in d.getVar("QT_LIB_NAMES", True).split():
49 pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" 50 pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
50 # NOTE: the headers for QtAssistantClient are different 51 # NOTE: the headers for QtAssistantClient are different
51 incname = name.replace("QtAssistantClient", "QtAssistant") 52 incname = name.replace("QtAssistantClient", "QtAssistant")
52 d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals()) 53 d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
53 d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl 54 d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
54 ${libdir}/lib%(name)s${QT_LIBINFIX}.a
55 ${libdir}/lib%(name)s${QT_LIBINFIX}.la 55 ${libdir}/lib%(name)s${QT_LIBINFIX}.la
56 ${libdir}/lib%(name)s${QT_LIBINFIX}.so 56 ${libdir}/lib%(name)s${QT_LIBINFIX}.so
57 ${includedir}/${QT_DIR_NAME}/%(incname)s 57 ${includedir}/${QT_DIR_NAME}/%(incname)s
58 ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals()) 58 ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
59 d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.a" % locals())
59 d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals()) 60 d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
60 d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg") 61 d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
61 lib_packages.append(pkg) 62 lib_packages.append(pkg)
62 dev_packages.append("%s-dev" % pkg) 63 dev_packages.append("%s-dev" % pkg)
63 dbg_packages.append("%s-dbg" % pkg) 64 dbg_packages.append("%s-dbg" % pkg)
65 staticdev_packages.append("%s-staticdev" % pkg)
64 for name in d.getVar("OTHER_PACKAGES", True).split(): 66 for name in d.getVar("OTHER_PACKAGES", True).split():
65 dbg_packages.append("%s-dbg" % name) 67 dbg_packages.append("%s-dbg" % name)
68 dbg_packages.append("%s-staticdev" % name)
66 69
67 for name in d.getVar("QT_EXTRA_LIBS", True).split(): 70 for name in d.getVar("QT_EXTRA_LIBS", True).split():
68 pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" 71 pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
69 d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals()) 72 d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
73 d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s.a" % locals())
70 d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl 74 d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
71 ${libdir}/lib%(name)s.a
72 ${libdir}/lib%(name)s.la 75 ${libdir}/lib%(name)s.la
73 ${libdir}/lib%(name)s.so 76 ${libdir}/lib%(name)s.so
74 ${includedir}/${QT_DIR_NAME}/%(incname)s 77 ${includedir}/${QT_DIR_NAME}/%(incname)s
@@ -78,10 +81,12 @@ python __anonymous () {
78 lib_packages.append(pkg) 81 lib_packages.append(pkg)
79 dev_packages.append("%s-dev" % pkg) 82 dev_packages.append("%s-dev" % pkg)
80 dbg_packages.append("%s-dbg" % pkg) 83 dbg_packages.append("%s-dbg" % pkg)
84 staticdev_packages.append("%s-staticdev" % pkg)
81 85
82 d.setVar("LIB_PACKAGES", " ".join(lib_packages)) 86 d.setVar("LIB_PACKAGES", " ".join(lib_packages))
83 d.setVar("DEV_PACKAGES", " ".join(dev_packages)) 87 d.setVar("DEV_PACKAGES", " ".join(dev_packages))
84 d.setVar("DBG_PACKAGES", " ".join(dbg_packages)) 88 d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
89 d.setVar("STATICDEV_PACKAGES", " ".join(staticdev_packages))
85} 90}
86 91
87OTHER_PACKAGES = "\ 92OTHER_PACKAGES = "\
@@ -109,7 +114,13 @@ OTHER_PACKAGES = "\
109 114
110#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before. 115#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
111PACKAGES =+ "${QT_BASE_NAME}-demos-doc" 116PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
112PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" 117PACKAGES += " \
118 ${LIB_PACKAGES} \
119 ${DEV_PACKAGES} \
120 ${DBG_PACKAGES} \
121 ${STATICDEV_PACKAGES} \
122 ${OTHER_PACKAGES}"
123
113PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*" 124PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
114 125
115ALLOW_EMPTY_${PN} = "1" 126ALLOW_EMPTY_${PN} = "1"
@@ -153,10 +164,12 @@ FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
153FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" 164FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
154FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer" 165FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
155FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*" 166FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
167FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/demos/shared/libdemo_shared.a"
156FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug" 168FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
157FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" 169FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
158FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*" 170FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
159FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*" 171FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
172FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
160FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*" 173FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
161FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf" 174FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
162FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" 175FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"