qmake5_base: export OE_QMAKE variables only in qtbase recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
1c29e5de8d
commit
56d2c7f18d
|
@ -6,10 +6,11 @@ inherit qmake5_base
|
||||||
QT5TOOLSDEPENDS ?= "qtbase-native "
|
QT5TOOLSDEPENDS ?= "qtbase-native "
|
||||||
DEPENDS_prepend = "${QT5TOOLSDEPENDS}"
|
DEPENDS_prepend = "${QT5TOOLSDEPENDS}"
|
||||||
|
|
||||||
export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5"
|
# do we still need to export these?
|
||||||
export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
|
#OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt5"
|
||||||
export OE_QMAKE_LIBS_QT = "qt"
|
#OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
|
||||||
export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
|
#OE_QMAKE_LIBS_QT = "qt"
|
||||||
export OE_QMAKE_LIBS_X11SM = "-lSM -lICE"
|
#OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
|
||||||
export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5"
|
#OE_QMAKE_LIBS_X11SM = "-lSM -lICE"
|
||||||
export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5"
|
#OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5"
|
||||||
|
#OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5"
|
||||||
|
|
|
@ -31,24 +31,25 @@ EXTRA_OEMAKE = " \
|
||||||
OE_QMAKE_AR='${OE_QMAKE_AR}' \
|
OE_QMAKE_AR='${OE_QMAKE_AR}' \
|
||||||
OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \
|
OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \
|
||||||
OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \
|
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}"
|
OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}"
|
||||||
export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}"
|
OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}"
|
||||||
export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake"
|
OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake"
|
||||||
export OE_QMAKE_COMPILER = "${CC}"
|
OE_QMAKE_COMPILER = "${CC}"
|
||||||
export OE_QMAKE_CC = "${CC}"
|
OE_QMAKE_CC = "${CC}"
|
||||||
export OE_QMAKE_CFLAGS = "${CFLAGS}"
|
OE_QMAKE_CFLAGS = "${CFLAGS}"
|
||||||
export OE_QMAKE_CXX = "${CXX}"
|
OE_QMAKE_CXX = "${CXX}"
|
||||||
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
|
OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
|
||||||
export OE_QMAKE_LINK = "${CXX}"
|
OE_QMAKE_LINK = "${CXX}"
|
||||||
export OE_QMAKE_LDFLAGS = "${LDFLAGS}"
|
OE_QMAKE_LDFLAGS = "${LDFLAGS}"
|
||||||
export OE_QMAKE_AR = "${AR}"
|
OE_QMAKE_AR = "${AR}"
|
||||||
export OE_QMAKE_STRIP = "echo"
|
OE_QMAKE_STRIP = "echo"
|
||||||
export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
|
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_CONF_PATH = "${WORKDIR}/qt.conf"
|
||||||
export QT_DIR_NAME ?= "qt5"
|
|
||||||
|
|
||||||
OE_QMAKE_PATH_PREFIX = "${prefix}"
|
OE_QMAKE_PATH_PREFIX = "${prefix}"
|
||||||
OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}"
|
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_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
|
||||||
OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}"
|
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() {
|
do_generate_qt_config_file() {
|
||||||
cat > ${QT_CONF_PATH} <<EOF
|
cat > ${QT_CONF_PATH} <<EOF
|
||||||
[Paths]
|
[Paths]
|
||||||
|
|
|
@ -74,6 +74,17 @@ EXTRA_OECONF = " \
|
||||||
-platform linux-oe-g++ \
|
-platform linux-oe-g++ \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
|
||||||
|
export OE_QMAKE_COMPILER
|
||||||
|
export OE_QMAKE_CC
|
||||||
|
export OE_QMAKE_CFLAGS
|
||||||
|
export OE_QMAKE_CXX
|
||||||
|
export OE_QMAKE_CXXFLAGS
|
||||||
|
export OE_QMAKE_LINK
|
||||||
|
export OE_QMAKE_LDFLAGS
|
||||||
|
export OE_QMAKE_AR
|
||||||
|
export OE_QMAKE_STRIP
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
# Similar logic is in autotools.bbclass
|
# Similar logic is in autotools.bbclass
|
||||||
if [ -d ${B} -a "${S}" != "${B}" ] ; then
|
if [ -d ${B} -a "${S}" != "${B}" ] ; then
|
||||||
|
|
|
@ -90,6 +90,17 @@ QMAKE_MKSPEC_PATH = "${B}"
|
||||||
OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}"
|
OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}"
|
||||||
OE_QMAKE_QMAKE = "bin/qmake"
|
OE_QMAKE_QMAKE = "bin/qmake"
|
||||||
|
|
||||||
|
# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell
|
||||||
|
export OE_QMAKE_COMPILER
|
||||||
|
export OE_QMAKE_CC
|
||||||
|
export OE_QMAKE_CFLAGS
|
||||||
|
export OE_QMAKE_CXX
|
||||||
|
export OE_QMAKE_CXXFLAGS
|
||||||
|
export OE_QMAKE_LINK
|
||||||
|
export OE_QMAKE_LDFLAGS
|
||||||
|
export OE_QMAKE_AR
|
||||||
|
export OE_QMAKE_STRIP
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
set_arch
|
set_arch
|
||||||
set_endian
|
set_endian
|
||||||
|
|
Loading…
Reference in New Issue