From 4b1d7738f089c5ca02be1f6d630bf31040d3a782 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 26 Feb 2016 19:19:28 +1100 Subject: qtbase: fix up pkgconfig replacements The replacements were being done in qt_module.prf which is not included when building 3rd party libraries. To resolve this, move the replacements from qt_module.prf to qt.prf which is included when building any qmake project. The pkgconfig include replacement is removed as it doesn't seem to be needed anymore and causes issues when the includedir path in pkgconfig has part of its path replaced with ${includedir} resulting in a circular reference that causes the OE package_do_pkgconfig task to fail. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 56 +++++++++++----------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 75201072..4807df09 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch @@ -61,11 +61,36 @@ Content-Transfer-Encoding: 8bit Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c Signed-off-by: Martin Jansa Signed-off-by: Andreas Müller +Signed-off-by: Jonathan Liu --- + mkspecs/features/qt.prf | 13 +++++++++++++ mkspecs/features/qt_common.prf | 2 +- - mkspecs/features/qt_module.prf | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+), 1 deletion(-) + 2 files changed, 14 insertions(+), 1 deletion(-) +diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf +index f62b6bb..91be8b3 100644 +--- a/mkspecs/features/qt.prf ++++ b/mkspecs/features/qt.prf +@@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) { + QTPLUGIN = $$manualplugs $$autoplugs + } + ++contains(TEMPLATE, .*lib) { ++ pkgconfig_prefix_replace.match = "prefix=$$[QT_SYSROOT]" ++ pkgconfig_prefix_replace.replace = "prefix=" ++ pkgconfig_prefix_replace.CONFIG = path ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_prefix_replace ++ ++ # drop -L/usr/lib in .prl files ++ prl_replace.match = "-L\$${libdir}" ++ prl_replace.replace = "" ++ prl_replace.CONFIG = path ++ QMAKE_PRL_INSTALL_REPLACE += prl_replace ++} ++ + QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN + contains(QT_CONFIG, static) { + QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 38602f6..f9c401f 100644 --- a/mkspecs/features/qt_common.prf @@ -79,33 +104,6 @@ index 38602f6..f9c401f 100644 } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index aefd3ae..775cda2 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -276,6 +276,22 @@ load(qt_targets) - ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR - ltlib_replace.CONFIG = path - QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace -+ -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_include_replace.CONFIG = path -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace -+ -+ pkgconfig_prefix_replace.match = "prefix=$$[QT_SYSROOT]" -+ pkgconfig_prefix_replace.replace = "prefix=" -+ pkgconfig_prefix_replace.CONFIG = path -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_prefix_replace -+ -+ # drop -L/usr/lib in .prl files -+ prl_replace.match = "-L\$${libdir}" -+ prl_replace.replace = "" -+ prl_replace.CONFIG = path -+ QMAKE_PRL_INSTALL_REPLACE += prl_replace - } - - contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE -- 2.7.1 -- cgit v1.2.3-54-g00ecf From 6e51a6c10823618e5454aeccfb510835361234d5 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 26 Feb 2016 19:20:12 +1100 Subject: libconnman-qt5: remove blacklist The package no longer fails sanity test because of connman-qt5.pc containing references to build host paths. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/libconnman-qt/libconnman-qt5_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb index 71c04df8..0fc4bc03 100644 --- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb @@ -15,5 +15,3 @@ S = "${WORKDIR}/git" inherit pkgconfig RDEPENDS_${PN} += "connman" - -PNBLACKLIST[libconnman-qt5] ?= "BROKEN: QA Issue: connman-qt5.pc failed sanity test (tmpdir)" -- cgit v1.2.3-54-g00ecf From dc6360b0a1cad074c9d7c27940502ce74aa4337f Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 26 Feb 2016 19:20:45 +1100 Subject: qtwebkit: backport patch to fix linking with qtwebkit Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- .../0004-Fix-linking-with-libpthread.patch | 33 ++++++++++++++++++++++ recipes-qt/qt5/qtwebkit_git.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch new file mode 100644 index 00000000..c5e6ac52 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch @@ -0,0 +1,33 @@ +From 5dd4bb67cfce812fd7686e43616e2069f354a7df Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Mon, 22 Feb 2016 10:57:32 +0100 +Subject: [PATCH] Fix linking with libpthread + +WebKit use libpthread directly but is depending on other qt modules +causing it to be linked against, which might break unless -lpthread +is last. Instead just add it explicitly after the static libraries. + +Upstream-Status: Backport from 5.7 branch + +Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 +Reviewed-by: Simon Hausmann +Signed-off-by: Jonathan Liu +--- + Tools/qmake/mkspecs/features/default_post.prf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf +index 67276b7..39bb3f7 100644 +--- a/Tools/qmake/mkspecs/features/default_post.prf ++++ b/Tools/qmake/mkspecs/features/default_post.prf +@@ -201,6 +201,7 @@ needToLink() { + linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir)) + LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs) + } ++ posix:!darwin: LIBS += -lpthread + } + + creating_module { +-- +2.7.1 + diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 9044d4fb..04cefada 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -22,6 +22,7 @@ SRC_URI += "\ file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ file://0002-Remove-TEXTREL-tag-in-x86.patch \ file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ + file://0004-Fix-linking-with-libpthread.patch \ " PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel" -- cgit v1.2.3-54-g00ecf From 7ef85da72aa6daae36f0527e3b7ad6b760886ffb Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sat, 27 Feb 2016 13:27:14 +1100 Subject: libconnman-qt5: update to 1.0.98 Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/libconnman-qt/libconnman-qt5_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb index 0fc4bc03..c9a81404 100644 --- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb @@ -5,9 +5,9 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" DEPENDS += "qtbase qtdeclarative" -PV = "1.0.97+git${SRCPV}" +PV = "1.0.98+git${SRCPV}" -SRCREV = "4cca434935fa4d70d6841a2c20717eecb0beafa8" +SRCREV = "8d4580a55ca02b84fc3db374c6530e39c94e0d92" SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From c1cf7c4a4cd553502e59ad665b5f91e906098b5c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 Mar 2016 01:54:16 +0100 Subject: gdb: include readline in default PACKAGECONFIG * without readline in PACKAGECONFIG and with no-static-libraries.inc gdb fails when trying to build against own bundled static readline Signed-off-by: Martin Jansa --- recipes-devtools/gdb/gdb_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/gdb/gdb_%.bbappend b/recipes-devtools/gdb/gdb_%.bbappend index 41592c41..3e663e71 100644 --- a/recipes-devtools/gdb/gdb_%.bbappend +++ b/recipes-devtools/gdb/gdb_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG ??= "python" +PACKAGECONFIG ??= "readline python" -- cgit v1.2.3-54-g00ecf From bd4c475915d8d81dc759308279c6612591d145dc Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 1 Mar 2016 11:27:36 +1300 Subject: Add .gitignore to ignore .pyc/.pyo files Since we just added lib/ containing python modules, we should really ignore any compiled python objects since they will be produced if the code is executed. Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..52e4e611 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.pyo -- cgit v1.2.3-54-g00ecf From d6fe20e6083d421cc6091892e1d302c46e2d075d Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 2 Mar 2016 13:15:24 +1100 Subject: qtwebengine: enable ARMv7VE support Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index d2975efd..8f5276f1 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -47,6 +47,7 @@ COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)" COMPATIBLE_MACHINE_armv6 = "(.*)" COMPATIBLE_MACHINE_armv7a = "(.*)" +COMPATIBLE_MACHINE_armv7ve = "(.*)" inherit qmake5 inherit gettext -- cgit v1.2.3-54-g00ecf