- qwt 6.1.0 changed the handling of the QT_INFIX variable. Builds with any QT_INFIX defined will fail as the generated qmake TARGET is always libqwt.* ignoring the INFIX, but sub-projects like designer respect the INFIX variable. - add PR/INC_PR to force recompile.
Signed-off-by: Björn Krombholz <[email protected]> --- for yocto-1.4 branch, 1.5 is still on qwt 6.0.1 meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch | 13 +++++++++++++ meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb | 2 ++ meta-oe/recipes-qt/qwt/qwt.inc | 5 ++++- meta-oe/recipes-qt/qwt/qwt_6.1.0.bb | 2 ++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch diff --git a/meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch b/meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch new file mode 100644 index 0000000..3a6fb64 --- /dev/null +++ b/meta-oe/recipes-qt/qwt/files/qwt-e_qt_infix.patch @@ -0,0 +1,13 @@ +Index: qwt-6.1.0/qwtfunctions.pri +=================================================================== +--- qwt-6.1.0.orig/qwtfunctions.pri 2014-04-11 16:25:59.291152505 +0200 ++++ qwt-6.1.0/qwtfunctions.pri 2014-04-11 16:26:25.749892402 +0200 +@@ -12,7 +12,7 @@ + defineReplace(qwtLibraryTarget) { + + unset(LIBRARY_NAME) +- LIBRARY_NAME = $$1 ++ LIBRARY_NAME = $$1$${QT_LIBINFIX} + + mac:contains(QWT_CONFIG, QwtFramework) { + diff --git a/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb b/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb index 7694514..3d46a7a 100644 --- a/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb +++ b/meta-oe/recipes-qt/qwt/qwt-e_6.1.0.bb @@ -2,6 +2,8 @@ inherit qt4e require qwt.inc +PR = "${INC_PR}.0" + SRC_URI[qwt.md5sum] = "aef0437b37f191067a6a9dc01c30ba64" SRC_URI[qwt.sha256sum] = "a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402" diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-qt/qwt/qwt.inc index 0ac71bf..bc65db6 100644 --- a/meta-oe/recipes-qt/qwt/qwt.inc +++ b/meta-oe/recipes-qt/qwt/qwt.inc @@ -5,8 +5,11 @@ SECTION = "libs" LICENSE = "QWTv1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" +INC_PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt/6.1.0/qwt-${PV}.tar.bz2;name=qwt \ - file://qwt6-fix-linking-with-ld-gold.patch" + file://qwt6-fix-linking-with-ld-gold.patch \ + file://qwt-e_qt_infix.patch " S = "${WORKDIR}/qwt-${PV}" diff --git a/meta-oe/recipes-qt/qwt/qwt_6.1.0.bb b/meta-oe/recipes-qt/qwt/qwt_6.1.0.bb index 97a53a8..eb12c1a 100644 --- a/meta-oe/recipes-qt/qwt/qwt_6.1.0.bb +++ b/meta-oe/recipes-qt/qwt/qwt_6.1.0.bb @@ -2,6 +2,8 @@ inherit qt4x11 require qwt.inc +PR = "${INC_PR}.0" + SRC_URI[qwt.md5sum] = "aef0437b37f191067a6a9dc01c30ba64" SRC_URI[qwt.sha256sum] = "a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402" -- 1.9.2 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
