summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase_git.bb30
1 files changed, 15 insertions, 15 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 200cb430..76deaedc 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -37,7 +37,7 @@ SRC_URI += "\
37" 37"
38 38
39# for syncqt 39# for syncqt
40RDEPENDS_${PN}-tools += "perl" 40RDEPENDS:${PN}-tools += "perl"
41 41
42# separate some parts of PACKAGECONFIG which are often changed 42# separate some parts of PACKAGECONFIG which are often changed
43PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}" 43PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', 'no-opengl', d)}"
@@ -159,8 +159,8 @@ QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-
159# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=bfd -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread 159# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=bfd -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread
160# 160#
161# http://errors.yoctoproject.org/Errors/Details/150329/ 161# http://errors.yoctoproject.org/Errors/Details/150329/
162# QT_CONFIG_FLAGS_GOLD_x86 = "-no-use-gold-linker" 162# QT_CONFIG_FLAGS_GOLD:x86 = "-no-use-gold-linker"
163# LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 163# LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
164 164
165# since the upgrade to 5.12.2 this got worse, with gold enabled configure will no longer pass the test for xlib 165# since the upgrade to 5.12.2 this got worse, with gold enabled configure will no longer pass the test for xlib
166# because with full paths to libraries since qtbase commit 521a85395 it fails to link with 166# because with full paths to libraries since qtbase commit 521a85395 it fails to link with
@@ -170,7 +170,7 @@ QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-
170# resulting in do_configure failure: 170# resulting in do_configure failure:
171# http://errors.yoctoproject.org/Errors/Details/237856/ 171# http://errors.yoctoproject.org/Errors/Details/237856/
172QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker" 172QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker"
173LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 173LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
174 174
175QT_CONFIG_FLAGS += " \ 175QT_CONFIG_FLAGS += " \
176 ${QT_CONFIG_FLAGS_GOLD} \ 176 ${QT_CONFIG_FLAGS_GOLD} \
@@ -182,9 +182,9 @@ QT_CONFIG_FLAGS += " \
182 ${PACKAGECONFIG_CONFARGS} \ 182 ${PACKAGECONFIG_CONFARGS} \
183" 183"
184 184
185export CC_host_toolchain-clang = "clang" 185export CC_host:toolchain-clang = "clang"
186export CXX_host_toolchain-clang = "clang++" 186export CXX_host:toolchain-clang = "clang++"
187export LD_host_toolchain-clang = "clang++" 187export LD_host:toolchain-clang = "clang++"
188export CC_host ?= "gcc" 188export CC_host ?= "gcc"
189export CXX_host ?= "g++" 189export CXX_host ?= "g++"
190export LD_host ?= "g++" 190export LD_host ?= "g++"
@@ -193,13 +193,13 @@ export LD_host ?= "g++"
193# since we cannot set empty set filename to a not existent file 193# since we cannot set empty set filename to a not existent file
194deltask generate_qt_config_file 194deltask generate_qt_config_file
195 195
196XPLATFORM_toolchain-clang = "linux-oe-clang" 196XPLATFORM:toolchain-clang = "linux-oe-clang"
197XPLATFORM ?= "linux-oe-g++" 197XPLATFORM ?= "linux-oe-g++"
198 198
199# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment 199# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment
200# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp 200# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp
201ARM_INSTRUCTION_SET_armv4 = "arm" 201ARM_INSTRUCTION_SET:armv4 = "arm"
202ARM_INSTRUCTION_SET_armv5 = "arm" 202ARM_INSTRUCTION_SET:armv5 = "arm"
203 203
204do_configure() { 204do_configure() {
205 # Regenerate header files when they are included in source tarball 205 # Regenerate header files when they are included in source tarball
@@ -237,7 +237,7 @@ do_configure() {
237 ${QT_CONFIG_FLAGS} 237 ${QT_CONFIG_FLAGS}
238} 238}
239 239
240do_install_append() { 240do_install:append() {
241 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" 241 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
242 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri 242 touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri
243 243
@@ -274,21 +274,21 @@ do_install_append() {
274} 274}
275 275
276# mkspecs have mac specific scripts that depend on perl and bash 276# mkspecs have mac specific scripts that depend on perl and bash
277INSANE_SKIP_${PN}-mkspecs += "file-rdeps" 277INSANE_SKIP:${PN}-mkspecs += "file-rdeps"
278 278
279RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 279RRECOMMENDS:${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
280 280
281TARGET_MKSPEC ?= "linux-g++" 281TARGET_MKSPEC ?= "linux-g++"
282 282
283# use clean mkspecs on target 283# use clean mkspecs on target
284pkg_postinst_${PN}-tools () { 284pkg_postinst:${PN}-tools () {
285sed -i \ 285sed -i \
286 -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ 286 -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \
287 -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ 287 -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \
288 $D${OE_QMAKE_PATH_BINS}/qt.conf 288 $D${OE_QMAKE_PATH_BINS}/qt.conf
289} 289}
290 290
291pkg_postinst_${PN}-mkspecs () { 291pkg_postinst:${PN}-mkspecs () {
292sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri 292sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri
293sed -i \ 293sed -i \
294 -e 's: cross_compile : :g' \ 294 -e 's: cross_compile : :g' \