diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-15 15:56:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-22 22:13:09 +0100 |
| commit | 4d7108f7afd3940da4597b2ad694754d0fe0b9d1 (patch) | |
| tree | b7dab36b1ec4441e81655e38d94d16e58fe45724 /meta/recipes-qt | |
| parent | 4cd373fc660c08657f9ce9c7f793d5fed38942f9 (diff) | |
| download | ast2050-yocto-poky-4d7108f7afd3940da4597b2ad694754d0fe0b9d1.zip ast2050-yocto-poky-4d7108f7afd3940da4597b2ad694754d0fe0b9d1.tar.gz | |
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.
(From OE-Core rev: 49102f3728425cacfaeb384491b9355bfa2a4230)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 5 |
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 5faf40c..d1f4b47 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 \ |
