diff options
| author | Jonathan Liu <net147@gmail.com> | 2015-08-30 18:41:33 +1000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-07 17:05:42 +0200 |
| commit | bfddb2291ed4f72995d1042a352c0ad1073a4b62 (patch) | |
| tree | e990059a6f15e8f2a3af4010e897a9fb3458254f /classes | |
| parent | dd6ba2b525e79a2d74a6b8629d40e484fcbe2ab2 (diff) | |
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 <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 8 | ||||
| -rw-r--r-- | classes/qmake5_paths.bbclass | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index ffb3103d..d371ff38 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -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++" diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index 8f91e938..c0310776 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -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}" |