sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Martin Jansa 2012-05-02 16:32:35 +02:00 committed by Richard Purdie
parent 1cd72bd132
commit e8005eb936
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch Normal file
View File

@ -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

1
meta/recipes-qt/qt4/qt-4.8.1.inc
View File

@ -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"

2
meta/recipes-qt/qt4/qt4-embedded.inc
View File

@ -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"

2
meta/recipes-qt/qt4/qt4-x11-free.inc
View File

@ -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"