diff options
Diffstat (limited to 'classes/qmake5_base.bbclass')
-rw-r--r-- | classes/qmake5_base.bbclass | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 37b608e2..dbba0bc9 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -15,7 +15,24 @@ OE_QMAKE_DEBUG_OUTPUT ?= "" | |||
15 | # Paths in .prl files contain SYSROOT value | 15 | # Paths in .prl files contain SYSROOT value |
16 | SSTATE_SCAN_FILES += "*.pri *.prl" | 16 | SSTATE_SCAN_FILES += "*.pri *.prl" |
17 | 17 | ||
18 | EXTRA_OEMAKE += " MAKEFLAGS='${PARALLEL_MAKE}'" | 18 | # drop default -e and add needed OE_QMAKE vars explicitly |
19 | # the problem is that when generated Makefile has: | ||
20 | # CFLAGS = -pipe $(OE_QMAKE_CFLAGS) -O2 -pthread -D_REENTRANT -Wall -W -fPIC $(DEFINES) | ||
21 | # then OE_QMAKE_CFLAGS are exported and used correctly, but then whole CFLAGS is overwritten from env (and -fPIC lost and build fails) | ||
22 | EXTRA_OEMAKE = " \ | ||
23 | MAKEFLAGS='${PARALLEL_MAKE}' \ | ||
24 | OE_QMAKE_COMPILER='${OE_QMAKE_COMPILER}' \ | ||
25 | OE_QMAKE_CC='${OE_QMAKE_CC}' \ | ||
26 | OE_QMAKE_CXX='${OE_QMAKE_CXX}' \ | ||
27 | OE_QMAKE_CFLAGS='${OE_QMAKE_CFLAGS}' \ | ||
28 | OE_QMAKE_CXXFLAGS='${OE_QMAKE_CXXFLAGS}' \ | ||
29 | OE_QMAKE_LINK='${OE_QMAKE_LINK}' \ | ||
30 | OE_QMAKE_LDFLAGS='${OE_QMAKE_LDFLAGS}' \ | ||
31 | OE_QMAKE_AR='${OE_QMAKE_AR}' \ | ||
32 | OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ | ||
33 | OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ | ||
34 | OE_QMAKE_QT_CONFIG='${OE_QMAKE_QT_CONFIG}' \ | ||
35 | " | ||
19 | 36 | ||
20 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" | 37 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" |
21 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" | 38 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" |
@@ -33,8 +50,6 @@ export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" | |||
33 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" | 50 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" |
34 | export QT_DIR_NAME ?= "qt5" | 51 | export QT_DIR_NAME ?= "qt5" |
35 | 52 | ||
36 | EXTRA_QMAKEVARS_PRE += "OE_QMAKE_WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner" | ||
37 | |||
38 | OE_QMAKE_PATH_PREFIX = "${prefix}" | 53 | OE_QMAKE_PATH_PREFIX = "${prefix}" |
39 | OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" | 54 | OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" |
40 | OE_QMAKE_PATH_LIBS = "${libdir}" | 55 | OE_QMAKE_PATH_LIBS = "${libdir}" |