diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-06-24 10:49:59 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-09-23 13:30:07 +0000 |
commit | 1b2862e896e31c89459f3186b7e9fdbd64d72bdd (patch) | |
tree | 415d56e329dc4ec4c10d1782e1030800f4c48806 /recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch | |
parent | a05a041900d20a730295ad02906f1a0c31b48a86 (diff) | |
download | meta-qt5-1b2862e896e31c89459f3186b7e9fdbd64d72bdd.tar.gz |
qt3d-runtime: update to ogl-runtime v2.4
Qt 3D Studio Runtime 2.x switches/upgrades to OpenGL Runtime with
version update 2.3 -> 2.4.
* Contains new 3rdparty submodule EASTL (Electronic Arts Standard
Template Library), recipe adjusted accordingly.
* format-security, examples & musl libc build issues fixed
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch')
-rw-r--r-- | recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch new file mode 100644 index 00000000..5fe840a0 --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From f654a25f9df6583532798f30181d149d51b23808 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 8 Aug 2019 08:34:47 +0300 | ||
4 | Subject: [PATCH] Fix build on musl libc | ||
5 | |||
6 | Use bits/local_lim.h only with glibc as it's not available | ||
7 | on musl libc. | ||
8 | |||
9 | Change-Id: Ibffa4ab5649b544664f99b16e94d6865148eeeb5 | ||
10 | --- | ||
11 | src/foundation/linux/Qt3DSLinuxThread.cpp | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/foundation/linux/Qt3DSLinuxThread.cpp b/src/foundation/linux/Qt3DSLinuxThread.cpp | ||
15 | index fa6e069..99c4c3a 100644 | ||
16 | --- a/src/foundation/linux/Qt3DSLinuxThread.cpp | ||
17 | +++ b/src/foundation/linux/Qt3DSLinuxThread.cpp | ||
18 | @@ -35,7 +35,7 @@ | ||
19 | #include "foundation/Qt3DSAssert.h" | ||
20 | #include "foundation/Qt3DSIntrinsics.h" | ||
21 | #include "foundation/Qt3DSBroadcastingAllocator.h" | ||
22 | -#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) | ||
23 | +#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) && defined(__GLIBC__) | ||
24 | #include <bits/local_lim.h> // PTHREAD_STACK_MIN | ||
25 | #endif | ||
26 | #include <stdio.h> | ||