aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <aleixpol@kde.org>2017-08-11 18:26:32 (GMT)
committerAleix Pol <aleixpol@kde.org>2017-08-11 18:26:32 (GMT)
commitd016215d753b6178fe615f92263eb4d693ef204a (patch)
tree45b3f423b7891d7f695c29bbbc632bec4e2d1158
parent8432eb7d00f7c40b83623b5e2ebd5130e8394c29 (diff)
Fix arm32 builds (QtWebEngine)
Introduce some different Qt settings for x86 Workaround QTBUG-61846 by compiling opus as a separate component
-rw-r--r--org.kde.Sdk.json26
1 files changed, 23 insertions, 3 deletions
diff --git a/org.kde.Sdk.json b/org.kde.Sdk.json
index d273b20..df689c5 100644
--- a/org.kde.Sdk.json
+++ b/org.kde.Sdk.json
@@ -73,8 +73,22 @@
{
"name": "qt5-qtbase",
"cleanup-platform": [ "/bin", "/mkspecs" ],
+ "build-options" : {
+ "arch" : {
+ "x86_64" : {
+ "config-opts" : [
+ "-debug", "-reduce-relocations"
+ ]
+ },
+ "arm" : {
+ "config-opts" : [
+ "-no-reduce-relocations", "-no-use-gold-linker", "-optimize-size"
+ ]
+ }
+ }
+ },
"config-opts": [ "-confirm-license", "-opensource",
- "-debug", "-shared",
+ "-shared",
"-platform", "linux-g++",
"-optimized-qmake",
"-nomake", "examples",
@@ -89,8 +103,6 @@
"-openssl-linked",
"-no-pch",
"-no-rpath",
- "-no-separate-debug-info",
- "-reduce-relocations",
"-no-directfb",
"-no-linuxfb",
"-no-kms",
@@ -206,6 +218,14 @@
{
"name": "qt5-qtwebengine",
"cleanup-platform": [ "/bin", "/mkspecs" ],
+ "modules": [
+ {
+ "name": "opus",
+ "sources": [
+ { "type": "git", "url": "https://github.com/xiph/opus.git", "branch": "v1.2.1" }
+ ]
+ }
+ ],
"sources": [
{ "type": "git", "url": "git://code.qt.io/qt/qtwebengine.git", "branch": "v5.9.1" },
{ "type": "patch", "path": "qtwebengine-no-udev.patch" },