summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-05-02 16:32:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 15:48:09 +0100
commite8005eb9360070aef131c74e17bc7ca3f070053d (patch)
tree70b5cd8b2e9abd36b71f32e76127d24a25ebd60c
parent1cd72bd13244c472e383060fff0d7d1901b77475 (diff)
downloadpoky-e8005eb9360070aef131c74e17bc7ca3f070053d.tar.gz
qt-4.8.1: fix creating /include directory in build host root
(From OE-Core rev: 7d3fd68480d54a8ef0d91a772df3506cd45ef2c2) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch19
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1.inc1
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
4 files changed, 22 insertions, 2 deletions
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 0000000000..9cb72baf9e
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch
@@ -0,0 +1,19 @@
1Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
2now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
3
4First reported here:
5http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
6
7Upstream-Status: Pending
8
9--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro.orig 2012-05-01 07:48:08.457613310 +0200
10+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro 2012-05-01 07:48:15.493613232 +0200
11@@ -3,6 +3,8 @@
12
13 CONFIG -= debug_and_release
14
15+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
16+
17 CONFIG(standalone_package) {
18 isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
19 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 2fc4228612..b923e60733 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}.
24 file://gcc47-fix2.patch \ 24 file://gcc47-fix2.patch \
25 file://disable-fuse-gold-flag.patch \ 25 file://disable-fuse-gold-flag.patch \
26 file://fix_conflicting_types.patch \ 26 file://fix_conflicting_types.patch \
27 file://set-OUTPUT_DIR-if-empty.patch \
27 " 28 "
28 29
29SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" 30SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 291e62ad3f..0b304a080b 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
2SECTION = "libs" 2SECTION = "libs"
3HOMEPAGE = "http://qt.nokia.com" 3HOMEPAGE = "http://qt.nokia.com"
4DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
5INC_PR = "r44" 5INC_PR = "r45"
6 6
7QT_BASE_LIB ?= "libqt-embedded" 7QT_BASE_LIB ?= "libqt-embedded"
8 8
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 720b1bfd14..da989623f1 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"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r42" 8INC_PR = "r43"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"