diff options
author | ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
---|---|---|
committer | ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
commit | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (patch) | |
tree | b4bb18dcd1487dbf1ea8127e5671b7bb2eded033 /external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5 | |
parent | 706ad73eb02caf8532deaf5d38995bd258725cb8 (diff) |
agl-basesystem
Diffstat (limited to 'external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5')
3 files changed, 70 insertions, 0 deletions
diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch new file mode 100644 index 00000000..a4103f25 --- /dev/null +++ b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch @@ -0,0 +1,32 @@ +From be5c73c72d1efa90ba440957d6f5ff3278c25545 Mon Sep 17 00:00:00 2001 +From: Samuel Stirtzel <s.stirtzel@googlemail.com> +Date: Wed, 1 Aug 2012 13:21:51 +0200 +Subject: [PATCH] Fix MALIIT_INSTALL_PRF to allow the build with openembedded + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> + +--- + config.pri | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/config.pri b/config.pri +index 8f24864..94d595a 100644 +--- a/config.pri ++++ b/config.pri +@@ -144,9 +144,11 @@ noxcb { + DEFINES += NOXCB + } + +-MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features +-local-install { +- MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX) ++isEmpty(MALIIT_INSTALL_PRF) { ++ MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features ++ local-install { ++ MALIIT_INSTALL_PRF = $$replace(MALIIT_INSTALL_PRF, $$[QT_INSTALL_PREFIX], $$PREFIX) ++ } + } + + defineTest(outputFile) { diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch new file mode 100644 index 00000000..2310e637 --- /dev/null +++ b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch @@ -0,0 +1,32 @@ +From fb4316ca6e44a6b34e7d109360fc716c372e1293 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Jul 2017 11:45:06 -0700 +Subject: [PATCH] config.pri: Use -O1 optimization in DEBUG flags + +when building wit FORTIFY_SOURCES we need some level of +optimization turned on for the compile to succeed + +O1 is a good compromise between debug quality and +optimization level. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + config.pri | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config.pri b/config.pri +index 94d595a..d7b221f 100644 +--- a/config.pri ++++ b/config.pri +@@ -15,8 +15,8 @@ include(defines.pri) + # Linker optimization for release build + QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed + # Compiler warnings are error if the build type is debug +-QMAKE_CXXFLAGS_DEBUG+=-Werror -O0 +-QMAKE_CFLAGS_DEBUG+=-Werror -O0 ++QMAKE_CXXFLAGS_DEBUG+=-Werror -O1 ++QMAKE_CFLAGS_DEBUG+=-Werror -O1 + + OBJECTS_DIR = .obj + MOC_DIR = .moc diff --git a/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop new file mode 100644 index 00000000..24bdf9b5 --- /dev/null +++ b/external/meta-qt5/recipes-qt/maliit/maliit-framework-qt5/maliit-server.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Maliit server +Exec=/usr/bin/maliit-server +Icon= +Type=Application +Categories=Utility; |