From 272fadb082ba2eeeb0893b3b1652a47db2d476b0 Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Thu, 4 Jan 2018 19:15:30 +0100 Subject: [PATCH] rocko migration: qt5: update recipe This new version of Qt already has a flag for optimizing for size, so remove the patch and use this flag instead. https://jira.digi.com/browse/DEL-5518 Signed-off-by: Jose Diaz de Grenu --- ...0001-gcc-base.conf-optimize-for-size.patch | 24 ------------------- .../recipes-qt/qt5/qtbase_%.bbappend | 3 ++- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch deleted file mode 100644 index 7ad545e8a..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Javier Viguera -Date: Thu, 3 Aug 2017 15:21:21 +0200 -Subject: [PATCH] gcc-base.conf: optimize for size - -Signed-off-by: Javier Viguera ---- - mkspecs/common/gcc-base.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index 6e043f558f1c..e77fb93326d4 100644 ---- a/mkspecs/common/gcc-base.conf -+++ b/mkspecs/common/gcc-base.conf -@@ -31,8 +31,8 @@ - # you can use the manual test in tests/manual/mkspecs. - # - --QMAKE_CFLAGS_OPTIMIZE = -O2 --QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 -+QMAKE_CFLAGS_OPTIMIZE = -Os -+QMAKE_CFLAGS_OPTIMIZE_FULL = -Os - - QMAKE_CFLAGS += -pipe - QMAKE_CFLAGS_DEPS += -M diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index 58da3e060..81987bfeb 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -3,12 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_append = " file://qt5.sh" -SRC_URI_append_ccimx6ul = " file://0001-gcc-base.conf-optimize-for-size.patch" PACKAGECONFIG_append = " accessibility examples fontconfig sql-sqlite" PACKAGECONFIG_append_ccimx6 = " icu" PACKAGECONFIG_append_ccimx6ul = " linuxfb" +QT_CONFIG_FLAGS += " -optimize-size" + do_install_append() { install -d ${D}${sysconfdir}/profile.d install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/