diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-02 12:55:00 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 11:03:12 +0300 |
commit | 89ac66bf3969b48eb771ef4c06a0b8df00fd178a (patch) | |
tree | b929ba359171175a23f3c10bb4ba199b00c17f4a /recipes-qt/qt5/qtbase-native_git.bb | |
parent | f087aeb1e988fcb0597fcf2b27981b1803909276 (diff) | |
parent | 8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38 (diff) |
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtyocto/upstream/warrior:
8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
7dc422d qtwayland: check also that the destination for private headers exists before installing them
84d647a qtwayland: improve manual header installation
3d60f9a qtwayland: workaround upstream bug: install missing headers manually
eb5d6da qtwayland: disable gold for all archs like in qtbase
e2707a0 qt5: upgrade to 5.12.3
0778424 qtbase: disable gold for all archs not just x86
4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
a4bf240 qtbase-native: add native libdir to search path
adf7f60 qt5: patch build paths from installed files
28d4bfd Upgrade to 5.12.2
5a32838 layer.conf: Add warrior to compatible release series
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I085dfdddbf7915f776bd48a6d26ecf96777d9d19
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index dad1fb5f..eb9b5514 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.5 +# 5.12.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -32,23 +32,23 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ - file://0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ - file://0014-Disable-ltcg-for-host_build.patch \ - file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0013-Disable-ltcg-for-host_build.patch \ + file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.5 +# 5.12.meta-qt5-native.7 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ + file://0017-Always-build-uic-and-qvkgen.patch \ + file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native SRC_URI += " \ - file://0022-Bootstrap-without-linkat-feature.patch \ + file://0019-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" @@ -56,7 +56,7 @@ CLEANBROKEN = "1" XPLATFORM_toolchain-clang = "linux-oe-clang" XPLATFORM ?= "linux-oe-g++" -PACKAGECONFIG_CONFARGS = " \ +QT_CONFIG_FLAGS = " \ -sysroot ${STAGING_DIR_NATIVE} \ -L${STAGING_LIBDIR_NATIVE} \ -no-gcc-sysroot \ @@ -97,6 +97,7 @@ PACKAGECONFIG_CONFARGS = " \ -no-rpath \ -no-feature-linkat \ -platform ${XPLATFORM} \ + ${PACKAGECONFIG_CONFARGS} \ " # for qtbase configuration we need default settings @@ -112,7 +113,7 @@ do_configure_prepend() { # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" touch ${S}/mkspecs/oe-device-extra.pri - MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -${QT_EDITION} -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" + MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -${QT_EDITION} -confirm-license ${QT_CONFIG_FLAGS} || die "Configuring qt failed. QT_CONFIG_FLAGS was ${QT_CONFIG_FLAGS}" } do_install() { |