qtserialport-e: Various fixes per openembedded-devel list comments.

* Change DESCRIPTION to SUMMARY
 * Fix LICENSE declarations to be version-specific
 * Coding convention fixes * Don't modify Makefiles modified by qmake2; instead
   symlink qmake2 in to $WORKDIR to be run from there so that it uses
   $WORKDIR/qt.conf values

Signed-off-by: Wayne Warren <steven.w.warren@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Wayne Warren 2013-04-22 18:45:11 +00:00 committed by Martin Jansa
parent 83d8217c45
commit 6f0d8c365f
3 changed files with 30 additions and 16 deletions

View File

@ -0,0 +1,6 @@
inherit qt4e
require qtserialport.inc
SRCREV = "22e45f0b0f956c025339d72ad53dca57ef684858"

View File

@ -1,15 +1,15 @@
DESCRIPTION = "Qt Serial Port Library"
SUMMARY = "Qt Serial Port Library"
SECTION = "qt/libs"
HOMEPAGE = "http://qt-project.org/wiki/QtSerialPort"
LICENSE = "LGPL FDL GPL "
LICENSE = "(LGPL-2.1 | GPL-3.0) & GFDL-1.3"
LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
"
inherit qt4e pkgconfig
inherit pkgconfig
SRC_URI = " \
git://gitorious.org/qt/qtserialport.git \
@ -18,17 +18,31 @@ SRC_URI = " \
S = "${WORKDIR}/git"
B = "${WORKDIR}/${BPN}-${PV}"
QMAKE_PROFILES="${S}/qtserialport.pro"
EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
QMAKE_PROFILES = "${S}/qtserialport.pro"
EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
OE_QMAKE_QMAKE = "${WORKDIR}/qmake2"
do_compile_append() {
BOGUS_PREFIX=`qmake2 -query QT_INSTALL_PREFIX`
for f in `find ${B} -name "Makefile"` ;do
sed -i -e "s|\(\$(INSTALL_ROOT)\)${BOGUS_PREFIX}|\1${prefix}|g" ${f}
done
do_prepare_qmake_symlink() {
ln -sf "${STAGING_BINDIR_NATIVE}/qmake2" ${WORKDIR}
}
addtask prepare_qmake_symlink after do_generate_qt_config_file before do_configure
do_configure_prepend() {
sed -i -e "s|\(Prefix\ =\).*|\1${prefix}|" ${WORKDIR}/qt.conf
sed -i -r -e "/^(Binaries|Headers|Plugins|Mkspecs)/ d" ${WORKDIR}/qt.conf
}
do_install() {
oe_runmake install DESTDIR=${D} INCLUDEDIR=${includedir}
}
FILES_${PN}-dev += " \
${includedir}/QtSerialPort/* \
${prefix}/mkspecs/* \
${libdir}/*.prl \
"
FILES_${PN}-dbg += " \
${libdir}/.debug/* \
"

View File

@ -1,6 +0,0 @@
require qtserialport.inc
PR = "r0"
SRCREV="22e45f0b0f956c025339d72ad53dca57ef684858"