summaryrefslogtreecommitdiff
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-06-15 15:56:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 17:41:20 +0100
commit49102f3728425cacfaeb384491b9355bfa2a4230 (patch)
tree4b99c60bc76c7b9f3149d30e25750bf040cb27ab /meta/recipes-qt
parent9fbef8144c5640b64b4485449f3ff697e95b5bfe (diff)
downloadopenembedded-core-49102f3728425cacfaeb384491b9355bfa2a4230.tar.gz
openembedded-core-49102f3728425cacfaeb384491b9355bfa2a4230.tar.bz2
openembedded-core-49102f3728425cacfaeb384491b9355bfa2a4230.tar.xz
openembedded-core-49102f3728425cacfaeb384491b9355bfa2a4230.zip
qt4-tools-nativesdk: fix unpack failure due to missing g++.conf
FILESPATHPKG was being used to in order to bring in linux.conf and g++.conf in this recipe, however this probably never worked since FILESPATHPKG always has the MACHINE appended to it and these are not machine-specific files. The only reason it built was that these two files could be found within the "files" subdir until we removed Qt 4.6.3. Using FILESEXTRAPATHS (as qt4-tools-native does) solves this. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 5faf40c33..d1f4b47a6 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -5,9 +5,10 @@ HOMEPAGE = "http://qt.nokia.com"
PRIORITY = "optional"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r3"
+INC_PR = "r4"
+
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
-FILESPATHPKG =. "qt-${PV}:"
inherit nativesdk qmake2
SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \