diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-08 22:20:41 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 13:56:49 +0200 |
| commit | 56d2c7f18d5058a168df01d6a4797514a0f958b6 (patch) | |
| tree | 68fe256fc67858632b890f60a802c0af2fb27f08 /classes | |
| parent | 1c29e5de8d402eb4a9d57c6104a33798f5004f68 (diff) | |
qmake5_base: export OE_QMAKE variables only in qtbase recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5.bbclass | 15 | ||||
| -rw-r--r-- | classes/qmake5_base.bbclass | 34 |
2 files changed, 24 insertions, 25 deletions
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 4140eb5f..349928f0 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -6,10 +6,11 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" -export OE_QMAKE_LIBS_QT = "qt" -export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" -export OE_QMAKE_LIBS_X11SM = "-lSM -lICE" -export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" -export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" +# do we still need to export these? +#OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5" +#OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" +#OE_QMAKE_LIBS_QT = "qt" +#OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" +#OE_QMAKE_LIBS_X11SM = "-lSM -lICE" +#OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" +#OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 34757c5a..9aeafd70 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -31,24 +31,25 @@ EXTRA_OEMAKE = " \ OE_QMAKE_AR='${OE_QMAKE_AR}' \ OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ - OE_QMAKE_QT_CONFIG='${OE_QMAKE_QT_CONFIG}' \ " -export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" -export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" -export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" -export OE_QMAKE_COMPILER = "${CC}" -export OE_QMAKE_CC = "${CC}" -export OE_QMAKE_CFLAGS = "${CFLAGS}" -export OE_QMAKE_CXX = "${CXX}" -export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_LINK = "${CXX}" -export OE_QMAKE_LDFLAGS = "${LDFLAGS}" -export OE_QMAKE_AR = "${AR}" -export OE_QMAKE_STRIP = "echo" -export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" +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_COMPILER = "${CC}" +OE_QMAKE_CC = "${CC}" +OE_QMAKE_CFLAGS = "${CFLAGS}" +OE_QMAKE_CXX = "${CXX}" +OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +OE_QMAKE_LINK = "${CXX}" +OE_QMAKE_LDFLAGS = "${LDFLAGS}" +OE_QMAKE_AR = "${AR}" +OE_QMAKE_STRIP = "echo" +OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" +QT_DIR_NAME ?= "qt5" + +# this one needs to be exported, because qmake reads it from shell env export QT_CONF_PATH = "${WORKDIR}/qt.conf" -export QT_DIR_NAME ?= "qt5" OE_QMAKE_PATH_PREFIX = "${prefix}" OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" @@ -70,9 +71,6 @@ OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" -# do not export STRIP to the environment -STRIP[unexport] = "1" - do_generate_qt_config_file() { cat > ${QT_CONF_PATH} <<EOF [Paths] |