diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-03-13 13:04:44 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-04-10 01:39:16 +0200 |
commit | d404dc581116014b814f05ed780bc9691006f12c (patch) | |
tree | 7b22abf0be3ff541b783288bfed62756d66ec07c /recipes-qt/qt5/ogl-runtime | |
parent | fd463388e1ecbe7f8c0749f1805a48531e48ed75 (diff) | |
download | meta-qt5-d404dc581116014b814f05ed780bc9691006f12c.tar.gz |
ogl-runtime: Fix build on ppc64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/ogl-runtime')
-rw-r--r-- | recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch b/recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch new file mode 100644 index 00000000..494d598a --- /dev/null +++ b/recipes-qt/qt5/ogl-runtime/0001-Qt3D-Add-support-to-fix-build-on-ppc64.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From c70df6bf52cdcdceb73ed965a28642177df32943 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 13 Mar 2021 12:58:32 -0800 | ||
4 | Subject: [PATCH] Qt3D: Add support to fix build on ppc64 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | src/foundation/Qt3DSPreprocessor.h | 2 +- | ||
10 | src/foundation/Qt3DSSystem.cpp | 8 +++++++- | ||
11 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/foundation/Qt3DSPreprocessor.h b/src/foundation/Qt3DSPreprocessor.h | ||
14 | index 066a38e..98ff573 100644 | ||
15 | --- a/src/foundation/Qt3DSPreprocessor.h | ||
16 | +++ b/src/foundation/Qt3DSPreprocessor.h | ||
17 | @@ -114,7 +114,7 @@ Platform define | ||
18 | #define QT3DS_X64 | ||
19 | #elif defined(__ppc__) | ||
20 | #define QT3DS_PPC | ||
21 | -#elif defined(__ppc64__) | ||
22 | +#elif defined(__powerpc64__) | ||
23 | #define QT3DS_PPC | ||
24 | #define QT3DS_PPC64 | ||
25 | //# elif defined(__aarch64__) | ||
26 | diff --git a/src/foundation/Qt3DSSystem.cpp b/src/foundation/Qt3DSSystem.cpp | ||
27 | index e87a25e..81f563f 100644 | ||
28 | --- a/src/foundation/Qt3DSSystem.cpp | ||
29 | +++ b/src/foundation/Qt3DSSystem.cpp | ||
30 | @@ -62,6 +62,10 @@ const char *qt3ds::foundation::System::g_FloatingPointModel = ""; | ||
31 | const char *qt3ds::foundation::System::g_Processor = "x64"; | ||
32 | const char *qt3ds::foundation::System::g_BitWidth = "64"; | ||
33 | const char *qt3ds::foundation::System::g_FloatingPointModel = ""; | ||
34 | +#elif defined(QT3DS_PPC64) | ||
35 | +const char *qt3ds::foundation::System::g_Processor = "ppc64"; | ||
36 | +const char *qt3ds::foundation::System::g_BitWidth = "64"; | ||
37 | +const char *qt3ds::foundation::System::g_FloatingPointModel = ""; | ||
38 | #elif defined(QT3DS_ARM) | ||
39 | #if defined(__aarch64__) || defined(__ARM64__) | ||
40 | const char *qt3ds::foundation::System::g_Processor = "arm"; | ||
41 | @@ -97,6 +101,8 @@ const char *qt3ds::foundation::System::g_GPUType = "gles3"; | ||
42 | const char *qt3ds::foundation::System::g_GPUType = ""; | ||
43 | #elif defined(QT3DS_X64) | ||
44 | const char *qt3ds::foundation::System::g_GPUType = ""; | ||
45 | +#elif defined(QT3DS_PPC64) | ||
46 | +const char *qt3ds::foundation::System::g_GPUType = ""; | ||
47 | #else | ||
48 | #error "Must define a processor type (QT3DS_ARM or QT3DS_X86)" | ||
49 | #endif | ||
50 | @@ -136,4 +142,4 @@ const char *System::getPlatformGLStr() | ||
51 | strcpy(text, str.c_str()); | ||
52 | } | ||
53 | return text; | ||
54 | -} | ||
55 | \ No newline at end of file | ||
56 | +} | ||
57 | -- | ||
58 | 2.30.2 | ||
59 | |||