diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-10-25 14:30:33 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-28 18:54:05 +0200 |
commit | 09f4a09bd2cdb5631dab707c38fdcc746e339ce7 (patch) | |
tree | d0eae49c6f07dfe6c0554e609c95a5444cec54ed /recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch | |
parent | 0be6a24a4623f52b8b92fa77f0f1c3faf4169d27 (diff) |
ogl-runtime: update to 2.5
Change-Id: Ia0e41696bceb06b76aaac21cca5930b2ff03b9ae
Reviewed-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, 0 insertions, 26 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 deleted file mode 100644 index 5fe840a0..00000000 --- a/recipes-qt/qt5/ogl-runtime/0003-Fix-build-on-musl-libc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f654a25f9df6583532798f30181d149d51b23808 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Thu, 8 Aug 2019 08:34:47 +0300 -Subject: [PATCH] Fix build on musl libc - -Use bits/local_lim.h only with glibc as it's not available -on musl libc. - -Change-Id: Ibffa4ab5649b544664f99b16e94d6865148eeeb5 ---- - src/foundation/linux/Qt3DSLinuxThread.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/foundation/linux/Qt3DSLinuxThread.cpp b/src/foundation/linux/Qt3DSLinuxThread.cpp -index fa6e069..99c4c3a 100644 ---- a/src/foundation/linux/Qt3DSLinuxThread.cpp -+++ b/src/foundation/linux/Qt3DSLinuxThread.cpp -@@ -35,7 +35,7 @@ - #include "foundation/Qt3DSAssert.h" - #include "foundation/Qt3DSIntrinsics.h" - #include "foundation/Qt3DSBroadcastingAllocator.h" --#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) -+#if !defined(QT3DS_APPLE) && !defined(ANDROID) && !defined(__CYGWIN__) && !defined(__QNX__) && !defined(__INTEGRITY) && defined(__GLIBC__) - #include <bits/local_lim.h> // PTHREAD_STACK_MIN - #endif - #include <stdio.h> |