[oe] [meta-qt5][WIP][PATCH] qtbase: fix 0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
Martin Jansa
martin.jansa at gmail.com
Wed Jul 2 15:35:42 UTC 2014
* again resolves this kind of warnings:
WARNING: QA Issue: qtxmlpatterns: The compile log indicates that host
include and/or library paths were used. Please check the log
'/OE/qtxmlpatterns/5.3.1-r0/temp/log.do_compile'
for more information.
---
...le-Fix-pkgconfig-and-libtool-replacements.patch | 45 +++++++++++++++++-----
...le-Fix-pkgconfig-and-libtool-replacements.patch | 45 +++++++++++++++++-----
2 files changed, 72 insertions(+), 18 deletions(-)
diff --git a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 29108cd..022f561 100644
--- a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -40,18 +40,50 @@ Content-Transfer-Encoding: 8bit
Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
Reviewed-by: Joerg Bornemann <joerg.bornemann at digia.com>
+* to debug this, rebuild qtbase and read build/src/corelib/Makefile
+* this is example of broken install_target rule (added line feeds):
+ -$(SED) -e s,/OE/5.3.1-r0/build/lib,/usr/lib,g
+ -e 's,/OE/5.3.1-r0/build/include,$$\{includedir},g'
+ -e 's,/OE/5.3.1-r0/build/lib,$$\{libdir},g'
+ "../../lib/pkgconfig/Qt5Core.pc"
+ >"$(INSTALL_ROOT)/usr/lib/pkgconfig/Qt5Core.pc"
+ change .prf files, create copy of WORKDIR, re-excecute only
+ do_configure task and compare generated Makefile, repeat until
+ replace in generated Makefile works ok, then refresh patch and
+ try complete rebuild for qtbase
+* if everything is ok, then try:
+ image $ grep -R "\-L/usr" .
+ image $ grep -R "\-I/usr" .
+ and it should return only few cases of
+ qmake.conf:QMAKE_LFLAGS_THREAD = -L/usr/lib/threads
+ for aix* platformas
+
Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
- mkspecs/features/qt_module.prf | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ mkspecs/features/qt_common.prf | 2 +-
+ mkspecs/features/qt_module.prf | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
+index 4dcabe9..d04bc3e 100644
+--- a/mkspecs/features/qt_common.prf
++++ b/mkspecs/features/qt_common.prf
+@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {
+ lib_replace.replace =
+ } else {
+ lib_replace.match = $$rplbase/lib
+- lib_replace.replace = $$qt_libdir
++ lib_replace.replace = "\$$\\{libdir}"
+ }
+ 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 8bf4c92..9737f8c 100644
+index 8bf4c92..fec6543 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
-@@ -188,10 +188,24 @@ unix|mingw {
+@@ -188,10 +188,19 @@ unix|mingw {
QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
@@ -60,11 +92,6 @@ index 8bf4c92..9737f8c 100644
+ pkgconfig_include_replace.CONFIG = path
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
+
-+ pkgconfig_lib_replace.match = $$rplbase/lib
-+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
-+ pkgconfig_lib_replace.CONFIG = path
-+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_lib_replace
-+
unix {
CONFIG += create_libtool explicitlib
QMAKE_LIBTOOL_LIBDIR = $$qt_libdir
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 6a7d714..4b13549 100644
--- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -40,18 +40,50 @@ Content-Transfer-Encoding: 8bit
Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
Reviewed-by: Joerg Bornemann <joerg.bornemann at digia.com>
+* to debug this, rebuild qtbase and read build/src/corelib/Makefile
+* this is example of broken install_target rule (added line feeds):
+ -$(SED) -e s,/OE/5.3.1-r0/build/lib,/usr/lib,g
+ -e 's,/OE/5.3.1-r0/build/include,$$\{includedir},g'
+ -e 's,/OE/5.3.1-r0/build/lib,$$\{libdir},g'
+ "../../lib/pkgconfig/Qt5Core.pc"
+ >"$(INSTALL_ROOT)/usr/lib/pkgconfig/Qt5Core.pc"
+ change .prf files, create copy of WORKDIR, re-excecute only
+ do_configure task and compare generated Makefile, repeat until
+ replace in generated Makefile works ok, then refresh patch and
+ try complete rebuild for qtbase
+* if everything is ok, then try:
+ image $ grep -R "\-L/usr" .
+ image $ grep -R "\-I/usr" .
+ and it should return only few cases of
+ qmake.conf:QMAKE_LFLAGS_THREAD = -L/usr/lib/threads
+ for aix* platformas
+
Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
- mkspecs/features/qt_module.prf | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ mkspecs/features/qt_common.prf | 2 +-
+ mkspecs/features/qt_module.prf | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
+index 4dcabe9..d04bc3e 100644
+--- a/mkspecs/features/qt_common.prf
++++ b/mkspecs/features/qt_common.prf
+@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {
+ lib_replace.replace =
+ } else {
+ lib_replace.match = $$rplbase/lib
+- lib_replace.replace = $$qt_libdir
++ lib_replace.replace = "\$$\\{libdir}"
+ }
+ 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 8bf4c92..9737f8c 100644
+index 8bf4c92..fec6543 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
-@@ -188,10 +188,24 @@ unix|mingw {
+@@ -188,10 +188,19 @@ unix|mingw {
QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
@@ -60,11 +92,6 @@ index 8bf4c92..9737f8c 100644
+ pkgconfig_include_replace.CONFIG = path
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
+
-+ pkgconfig_lib_replace.match = $$rplbase/lib
-+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
-+ pkgconfig_lib_replace.CONFIG = path
-+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_lib_replace
-+
unix {
CONFIG += create_libtool explicitlib
QMAKE_LIBTOOL_LIBDIR = $$qt_libdir
--
2.0.0
More information about the Openembedded-devel
mailing list