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/qmake5_base.bbclass | |
parent | 1c29e5de8d402eb4a9d57c6104a33798f5004f68 (diff) | |
download | meta-qt5-56d2c7f18d5058a168df01d6a4797514a0f958b6.tar.gz |
qmake5_base: export OE_QMAKE variables only in qtbase recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes/qmake5_base.bbclass')
-rw-r--r-- | classes/qmake5_base.bbclass | 34 |
1 files changed, 16 insertions, 18 deletions
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 = " \ | |||
31 | OE_QMAKE_AR='${OE_QMAKE_AR}' \ | 31 | OE_QMAKE_AR='${OE_QMAKE_AR}' \ |
32 | OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ | 32 | OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ |
33 | OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ | 33 | OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ |
34 | OE_QMAKE_QT_CONFIG='${OE_QMAKE_QT_CONFIG}' \ | ||
35 | " | 34 | " |
36 | 35 | ||
37 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" | 36 | OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" |
38 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" | 37 | OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" |
39 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 38 | OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" |
40 | export OE_QMAKE_COMPILER = "${CC}" | 39 | OE_QMAKE_COMPILER = "${CC}" |
41 | export OE_QMAKE_CC = "${CC}" | 40 | OE_QMAKE_CC = "${CC}" |
42 | export OE_QMAKE_CFLAGS = "${CFLAGS}" | 41 | OE_QMAKE_CFLAGS = "${CFLAGS}" |
43 | export OE_QMAKE_CXX = "${CXX}" | 42 | OE_QMAKE_CXX = "${CXX}" |
44 | export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" | 43 | OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" |
45 | export OE_QMAKE_LINK = "${CXX}" | 44 | OE_QMAKE_LINK = "${CXX}" |
46 | export OE_QMAKE_LDFLAGS = "${LDFLAGS}" | 45 | OE_QMAKE_LDFLAGS = "${LDFLAGS}" |
47 | export OE_QMAKE_AR = "${AR}" | 46 | OE_QMAKE_AR = "${AR}" |
48 | export OE_QMAKE_STRIP = "echo" | 47 | OE_QMAKE_STRIP = "echo" |
49 | export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" | 48 | OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" |
49 | QT_DIR_NAME ?= "qt5" | ||
50 | |||
51 | # this one needs to be exported, because qmake reads it from shell env | ||
50 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" | 52 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" |
51 | export QT_DIR_NAME ?= "qt5" | ||
52 | 53 | ||
53 | OE_QMAKE_PATH_PREFIX = "${prefix}" | 54 | OE_QMAKE_PATH_PREFIX = "${prefix}" |
54 | OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" | 55 | OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" |
@@ -70,9 +71,6 @@ OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" | |||
70 | OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" | 71 | OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" |
71 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" | 72 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" |
72 | 73 | ||
73 | # do not export STRIP to the environment | ||
74 | STRIP[unexport] = "1" | ||
75 | |||
76 | do_generate_qt_config_file() { | 74 | do_generate_qt_config_file() { |
77 | cat > ${QT_CONF_PATH} <<EOF | 75 | cat > ${QT_CONF_PATH} <<EOF |
78 | [Paths] | 76 | [Paths] |