diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-05-02 16:32:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:48:09 +0100 |
commit | e8005eb9360070aef131c74e17bc7ca3f070053d (patch) | |
tree | 70b5cd8b2e9abd36b71f32e76127d24a25ebd60c /meta/recipes-qt/qt4/files | |
parent | 1cd72bd13244c472e383060fff0d7d1901b77475 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-qt/qt4/files')
-rw-r--r-- | meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch | 19 |
1 files changed, 19 insertions, 0 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 @@ | |||
1 | Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem | ||
2 | now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl | ||
3 | |||
4 | First reported here: | ||
5 | http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html | ||
6 | |||
7 | Upstream-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 | ||