[oe-commits] Paul Eggleton : qt4-tools-nativesdk: fix unpack failure due to missing g++. conf

git version control git at git.openembedded.org
Wed Jun 22 16:42:12 UTC 2011


Module: openembedded-core.git
Branch: master
Commit: 49102f3728425cacfaeb384491b9355bfa2a4230
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=49102f3728425cacfaeb384491b9355bfa2a4230

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Jun 15 15:56:16 2011 +0100

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 at linux.intel.com>

---

 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 \





More information about the Openembedded-commits mailing list