Patchwork [3/4] qt-4.8.1: fix creating /include directory in build host root

login
register
mail settings
Submitter Martin Jansa
Date May 2, 2012, 2:32 p.m.
Message ID <8bad5055c1e2074bee56611b8b42477086087159.1335969047.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/26827/
State Accepted
Commit 7d3fd68480d54a8ef0d91a772df3506cd45ef2c2
Headers show

Comments

Martin Jansa - May 2, 2012, 2:32 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../qt4/files/set-OUTPUT_DIR-if-empty.patch        |   19 +++++++++++++++++++
 meta/recipes-qt/qt4/qt-4.8.1.inc                   |    1 +
 meta/recipes-qt/qt4/qt4-embedded.inc               |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc               |    2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch

Patch

diff --git a/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch b/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch
new file mode 100644
index 0000000..9cb72ba
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch
@@ -0,0 +1,19 @@ 
+Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
+now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
+
+First reported here:
+http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
+
+Upstream-Status: Pending
+
+--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro.orig	2012-05-01 07:48:08.457613310 +0200
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro	2012-05-01 07:48:15.493613232 +0200
+@@ -3,6 +3,8 @@
+ 
+ CONFIG -= debug_and_release
+ 
++isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
++
+ CONFIG(standalone_package) {
+     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
+     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc
index 2fc4228..b923e60 100644
--- a/meta/recipes-qt/qt4/qt-4.8.1.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.1.inc
@@ -24,6 +24,7 @@  SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://gcc47-fix2.patch \
            file://disable-fuse-gold-flag.patch \
            file://fix_conflicting_types.patch \
+           file://set-OUTPUT_DIR-if-empty.patch \
            "
 
 SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 291e62a..0b304a0 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@  DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r44"
+INC_PR = "r45"
 
 QT_BASE_LIB  ?= "libqt-embedded"
 
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 720b1bf..da98962 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"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r42"
+INC_PR = "r43"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"