From: Paul Eggleton Date: Wed, 15 Jun 2011 14:56:16 +0000 (+0100) Subject: qt4-tools-nativesdk: fix unpack failure due to missing g++.conf X-Git-Tag: 2011-1~1070 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=49102f3728425cacfaeb384491b9355bfa2a4230;p=openembedded-core.git 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 --- diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc index 5faf40c33a..d1f4b47a6e 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 \