From 6f0dd9f7cb4166f22b78c0813819c636f6382e4f Mon Sep 17 00:00:00 2001 From: Adam YH Lee Date: Fri, 4 Sep 2015 17:28:30 -0700 Subject: Remove double slash when QT_DIR_NAME is empty When `QT_DIR_NAME` is defined as an empty string (default is "qt5"), package.bbclass will throw lots of QA warnings because now the paths contain double slashes ("//"). We can address these warnings by explicitly defining a slash in the variable itself. Signed-off-by: Adam YH Lee Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 2 +- classes/qmake5_paths.bbclass | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'classes') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d371ff38..9ebfa08e 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -32,7 +32,7 @@ EXTRA_OEMAKE = " \ OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" -OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" +OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" OE_QMAKE_COMPILER = "${CC}" OE_QMAKE_CC = "${CC}" OE_QMAKE_CFLAGS = "${CFLAGS}" diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index c0310776..90e1789b 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -2,48 +2,48 @@ # about conflicts with qt4, then you can add qmake5_paths.bbclass # to your distro layer and flatten all QT_DIR_NAME directories -QT_DIR_NAME ?= "qt5" +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_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_HEADERS = "${includedir}${QT_DIR_NAME}" OE_QMAKE_PATH_LIBS = "${libdir}" OE_QMAKE_PATH_ARCHDATA = "${libdir}" OE_QMAKE_PATH_DATA = "${datadir}" OE_QMAKE_PATH_BINS = "${bindir}" -OE_QMAKE_PATH_LIBEXECS = "${libdir}/${QT_DIR_NAME}/libexec" -OE_QMAKE_PATH_PLUGINS = "${libdir}/${QT_DIR_NAME}/plugins" -OE_QMAKE_PATH_IMPORTS = "${libdir}/${QT_DIR_NAME}/imports" -OE_QMAKE_PATH_QML = "${libdir}/${QT_DIR_NAME}/qml" +OE_QMAKE_PATH_LIBEXECS = "${libdir}${QT_DIR_NAME}/libexec" +OE_QMAKE_PATH_PLUGINS = "${libdir}${QT_DIR_NAME}/plugins" +OE_QMAKE_PATH_IMPORTS = "${libdir}${QT_DIR_NAME}/imports" +OE_QMAKE_PATH_QML = "${libdir}${QT_DIR_NAME}/qml" OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations" OE_QMAKE_PATH_DOCS = "${docdir}" OE_QMAKE_PATH_SETTINGS = "${sysconfdir}" OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" OE_QMAKE_PATH_TESTS = "${datadir}/tests" OE_QMAKE_PATH_HOST_PREFIX = "" -OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" -OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" +OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}" # for qt5 components we're using QT_DIR_NAME subdirectory in more # variables, because we don't want conflicts with qt4 # This block is usefull for components which install their # own files without QT_DIR_NAME but need to reference paths e.g. # with QT headers -OE_QMAKE_PATH_QT_HEADERS = "${includedir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_DATA = "${datadir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_BINS = "${bindir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" -OE_QMAKE_PATH_QT_DOCS = "${docdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" -OE_QMAKE_PATH_QT_TESTS = "${datadir}/${QT_DIR_NAME}/tests" +OE_QMAKE_PATH_QT_HEADERS = "${includedir}${QT_DIR_NAME}" +OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}${QT_DIR_NAME}" +OE_QMAKE_PATH_QT_DATA = "${datadir}${QT_DIR_NAME}" +OE_QMAKE_PATH_QT_BINS = "${bindir}${QT_DIR_NAME}" +OE_QMAKE_PATH_QT_TRANSLATIONS = "${datadir}${QT_DIR_NAME}/translations" +OE_QMAKE_PATH_QT_DOCS = "${docdir}${QT_DIR_NAME}" +OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}${QT_DIR_NAME}" +OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}${QT_DIR_NAME}/examples" +OE_QMAKE_PATH_QT_TESTS = "${datadir}${QT_DIR_NAME}/tests" -- cgit v1.2.3-54-g00ecf