diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-08-11 18:46:54 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-11-03 17:01:34 +0100 |
| commit | 81516e098cbabd91a1c76767012ca1e44fe4c0ce (patch) | |
| tree | 4a5ed312de2ffbafada2c400882c2c442f679f37 /recipes-qt/qt5/qt5-creator_git.bb | |
| parent | 6bfe6132d7f728b148653c6029ea3207da5deaee (diff) | |
qt5-creator: Update to 4.13.0 beta2
Fixed build with clang11 and musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4d3191999e9156df0fc3fd9a86611be892a11d7e)
Diffstat (limited to 'recipes-qt/qt5/qt5-creator_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index d046110b..0dd9c234 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb @@ -18,13 +18,13 @@ DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qtto DEPENDS_append_toolchain-clang = " clang llvm-common" DEPENDS_append_libc-musl = " libexecinfo" -SRCREV = "9e057a55368286058023510efc328f68250ecb5e" -PV = "4.12.0+git${SRCPV}" - +SRCREV = "501e7c2fddec6b93e273dadcac389cd8c934cf00" +PV = "4.12.4+4.13.0+git${SRCPV}" # Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2 # 4.9.2.meta-qt5.1 SRC_URI = " \ - git://code.qt.io/qt-creator/qt-creator.git;branch=4.12 \ + git://code.qt.io/qt-creator/qt-creator.git;branch=4.13 \ + file://0001-app-Use-malloc_trim-only-on-glibc.patch \ " SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" @@ -41,10 +41,10 @@ do_configure_append() { # Find native tools sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile if [ -e ${B}/share/qtcreator/translations/Makefile ]; then - sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile - sed -i 's:${STAGING_BINDIR}.*/lupdate:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate:g' ${B}/share/qtcreator/translations/Makefile - sed -i 's:${STAGING_BINDIR}.*/xmlpatterns:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/xmlpatterns:g' ${B}/share/qtcreator/translations/Makefile - sed -i 's:${STAGING_BINDIR}.*/lconvert:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}/lupdate:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}/xmlpatterns:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/xmlpatterns:g' ${B}/share/qtcreator/translations/Makefile + sed -i 's:${STAGING_BINDIR}/lconvert:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert:g' ${B}/share/qtcreator/translations/Makefile fi } |