[oe] [WIP][meta-qt5][PATCH 5/5] qmake5_base.bbclass: fix typo
Martin Jansa
martin.jansa at gmail.com
Thu May 28 13:22:56 UTC 2015
From: Alexis Cellier <alexis.cellier at openwide.fr>
In the qt.conf file created, fix typo on "TargetSpec" (was "TartgetSpec").
Signed-off-by: Alexis Cellier <alexis.cellier at openwide.fr>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
classes/qmake5_base.bbclass | 2 +-
recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +-
recipes-qt/qt5/qtbase_git.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 44575c4..dbdaf78 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -79,7 +79,7 @@ HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
HostData = ${OE_QMAKE_PATH_HOST_DATA}
HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
HostSpec = ${OE_QMAKESPEC}
-TartgetSpec = ${OE_XQMAKESPEC}
+TargetSpec = ${OE_XQMAKESPEC}
ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
Sysroot = ${STAGING_DIR_TARGET}
EOF
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 2d9d280..3369940 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -122,7 +122,7 @@ EOF
}
# qtbase is exception, we need to use mkspecs from ${S}
-QMAKE_MKSPEC_PATH = "${B}"
+QMAKE_MKSPEC_PATH = "${S}"
# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
export OE_QMAKE_COMPILER
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 0b07c60..2644e30 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -142,7 +142,7 @@ EOF
}
# qtbase is exception, we need to use mkspecs from ${S}
-QMAKE_MKSPEC_PATH = "${B}"
+QMAKE_MKSPEC_PATH = "${S}"
# another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location
OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake"
--
2.4.1
More information about the Openembedded-devel
mailing list