From c62d5e1e42b774712bd54a267ffe6024065fd5ce Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 3 Aug 2017 17:56:29 +0200
Subject: [PATCH] qtbase: optimize libraries for size on CC6UL

This patch makes smaller libQt libraries saving some space in the CC6UL
rootfs.

Libraries size before the patch:

root@ccimx6ulsbc:~# ls -l /usr/lib/libQt*5.7.1
     22448 Aug  /usr/lib/libQt5Concurrent.so.5.7.1
   5347036 Aug  /usr/lib/libQt5Core.so.5.7.1
    508464 Aug  /usr/lib/libQt5DBus.so.5.7.1
   4419712 Aug  /usr/lib/libQt5Gui.so.5.7.1
   1367776 Aug  /usr/lib/libQt5Network.so.5.7.1
    275900 Aug  /usr/lib/libQt5OpenGL.so.5.7.1
    341688 Aug  /usr/lib/libQt5PrintSupport.so.5.7.1
     88628 Aug  /usr/lib/libQt5SerialPort.so.5.7.1
    290960 Aug  /usr/lib/libQt5Sql.so.5.7.1
    212432 Aug  /usr/lib/libQt5Test.so.5.7.1
   5306588 Aug  /usr/lib/libQt5Widgets.so.5.7.1
    894928 Aug  /usr/lib/libQt5XcbQpa.so.5.7.1
    191404 Aug  /usr/lib/libQt5Xml.so.5.7.1

Libraries size after the patch:

root@ccimx6ulsbc:~# ls -l /usr/lib/libQt*5.7.1
     18352 Aug  /usr/lib/libQt5Concurrent.so.5.7.1
   4032380 Aug  /usr/lib/libQt5Core.so.5.7.1
    303684 Aug  /usr/lib/libQt5DBus.so.5.7.1
   2867436 Aug  /usr/lib/libQt5Gui.so.5.7.1
    839428 Aug  /usr/lib/libQt5Network.so.5.7.1
    239044 Aug  /usr/lib/libQt5OpenGL.so.5.7.1
    267976 Aug  /usr/lib/libQt5PrintSupport.so.5.7.1
     59960 Aug  /usr/lib/libQt5SerialPort.so.5.7.1
    172192 Aug  /usr/lib/libQt5Sql.so.5.7.1
    171500 Aug  /usr/lib/libQt5Test.so.5.7.1
   4282740 Aug  /usr/lib/libQt5Widgets.so.5.7.1
    616420 Aug  /usr/lib/libQt5XcbQpa.so.5.7.1
    154556 Aug  /usr/lib/libQt5Xml.so.5.7.1

https://jira.digi.com/browse/DEL-4644

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 ...0001-gcc-base.conf-optimize-for-size.patch | 24 +++++++++++++++++++
 .../recipes-qt/qt5/qtbase_%.bbappend          |  1 +
 2 files changed, 25 insertions(+)
 create 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
new file mode 100644
index 000000000..7ad545e8a
--- /dev/null
+++ b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/0001-gcc-base.conf-optimize-for-size.patch
@@ -0,0 +1,24 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Thu, 3 Aug 2017 15:21:21 +0200
+Subject: [PATCH] gcc-base.conf: optimize for size
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ 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 b4012bc2b..58da3e060 100644
--- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
+++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
@@ -3,6 +3,7 @@
 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"