classes: qmake5: move QMAKE_MKSPEC_PATH variables to qmake5_paths

PATCH New Jonathan Liu 1 participant 1 message Aug 30, 2015

Share & tools

Jonathan Liu

author

2015-08-30 08:41 UTC #0 lore raw

PATCH 1/1 classes: qmake5: move QMAKE_MKSPEC_PATH variables to qmake5_paths

qmake5_paths.bbclass refers to QMAKE_MKSPEC_PATH_TARGET which is not defined when inheriting qmake5_paths directly instead of qmake5_base.

Signed-off-by Jonathan Liu <[email protected]>

---
 classes/qmake5_base.bbclass  | 8 --------
 classes/qmake5_paths.bbclass | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

classes/qmake5_base.bbclass +0 -8

index ffb3103..d371ff3 100644
@@ -1,11 +1,3 @@
-# This is useful for target recipes to reference native mkspecs
-QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}"
-QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}/${QT_DIR_NAME}"
-
-QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
-QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
-QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
-
 # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
 OE_QMAKE_PLATFORM_NATIVE = "linux-oe-g++"
 OE_QMAKE_PLATFORM = "linux-oe-g++"

classes/qmake5_paths.bbclass +8 -0

index 8f91e93..c031077 100644
@@ -4,6 +4,14 @@
 
 QT_DIR_NAME ?= "qt5"
 
+# This is useful for target recipes to reference native mkspecs
+QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}"
+QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}/${QT_DIR_NAME}"
+
+QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
+QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
+QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
+
 OE_QMAKE_PATH_PREFIX = "${prefix}"
 OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}"
 OE_QMAKE_PATH_LIBS = "${libdir}"

Signature · 1 line

2.5.0