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 | |
parent | 6bfe6132d7f728b148653c6029ea3207da5deaee (diff) | |
download | meta-qt5-81516e098cbabd91a1c76767012ca1e44fe4c0ce.tar.gz |
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)
-rw-r--r-- | recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch | 32 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 16 |
2 files changed, 40 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch b/recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch new file mode 100644 index 00000000..6ee5b7b5 --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/0001-app-Use-malloc_trim-only-on-glibc.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 46ec546fdc4427019184f84f24efe3e145b7e40f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 11 Aug 2020 21:19:22 -0700 | ||
4 | Subject: [PATCH] app: Use malloc_trim only on glibc | ||
5 | |||
6 | musl does not implement it | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | src/app/main.cpp | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/src/app/main.cpp b/src/app/main.cpp | ||
15 | index 419b9b362a..9e150e7613 100644 | ||
16 | --- a/src/app/main.cpp | ||
17 | +++ b/src/app/main.cpp | ||
18 | @@ -719,7 +719,11 @@ int main(int argc, char **argv) | ||
19 | m_trimTimer.setSingleShot(true); | ||
20 | m_trimTimer.setInterval(60000); | ||
21 | // glibc may not actually free memory in free(). | ||
22 | +#ifdef __GLIBC__ | ||
23 | connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); }); | ||
24 | +#else | ||
25 | + connect(&m_trimTimer, &QTimer::timeout, this, [] { }); | ||
26 | +#endif | ||
27 | } | ||
28 | |||
29 | bool eventFilter(QObject *, QEvent *e) override | ||
30 | -- | ||
31 | 2.28.0 | ||
32 | |||
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 | |||
18 | DEPENDS_append_toolchain-clang = " clang llvm-common" | 18 | DEPENDS_append_toolchain-clang = " clang llvm-common" |
19 | DEPENDS_append_libc-musl = " libexecinfo" | 19 | DEPENDS_append_libc-musl = " libexecinfo" |
20 | 20 | ||
21 | SRCREV = "9e057a55368286058023510efc328f68250ecb5e" | 21 | SRCREV = "501e7c2fddec6b93e273dadcac389cd8c934cf00" |
22 | PV = "4.12.0+git${SRCPV}" | 22 | PV = "4.12.4+4.13.0+git${SRCPV}" |
23 | |||
24 | # Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2 | 23 | # Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2 |
25 | # 4.9.2.meta-qt5.1 | 24 | # 4.9.2.meta-qt5.1 |
26 | SRC_URI = " \ | 25 | SRC_URI = " \ |
27 | git://code.qt.io/qt-creator/qt-creator.git;branch=4.12 \ | 26 | git://code.qt.io/qt-creator/qt-creator.git;branch=4.13 \ |
27 | file://0001-app-Use-malloc_trim-only-on-glibc.patch \ | ||
28 | " | 28 | " |
29 | SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" | 29 | SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch" |
30 | 30 | ||
@@ -41,10 +41,10 @@ do_configure_append() { | |||
41 | # Find native tools | 41 | # Find native tools |
42 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile | 42 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile |
43 | if [ -e ${B}/share/qtcreator/translations/Makefile ]; then | 43 | if [ -e ${B}/share/qtcreator/translations/Makefile ]; then |
44 | sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile | 44 | sed -i 's:${STAGING_BINDIR}/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile |
45 | sed -i 's:${STAGING_BINDIR}.*/lupdate:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate:g' ${B}/share/qtcreator/translations/Makefile | 45 | sed -i 's:${STAGING_BINDIR}/lupdate:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate:g' ${B}/share/qtcreator/translations/Makefile |
46 | sed -i 's:${STAGING_BINDIR}.*/xmlpatterns:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/xmlpatterns:g' ${B}/share/qtcreator/translations/Makefile | 46 | sed -i 's:${STAGING_BINDIR}/xmlpatterns:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/xmlpatterns:g' ${B}/share/qtcreator/translations/Makefile |
47 | sed -i 's:${STAGING_BINDIR}.*/lconvert:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert:g' ${B}/share/qtcreator/translations/Makefile | 47 | sed -i 's:${STAGING_BINDIR}/lconvert:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert:g' ${B}/share/qtcreator/translations/Makefile |
48 | fi | 48 | fi |
49 | } | 49 | } |
50 | 50 | ||