diff options
| -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}" |