[oe-commits] Paul Eggleton : qt4: fix debug symbol stripping

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c2f6dc09a7663f69308558553be9420df3a81b6b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c2f6dc09a7663f69308558553be9420df3a81b6b

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Dec  6 16:51:00 2011 +0000

qt4: fix debug symbol stripping

Adds a patch imported from Debian to not strip the executables as part
of the Qt build process. This fixes the warnings shown at packaging
stage as well as the content of the debug symbol packages.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 .../qt4/files/add_nostrip_for_debug_packages.diff  |   23 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt-4.7.4.inc                   |    1 +
 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb          |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb          |    2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff b/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
new file mode 100644
index 0000000..774cb99
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
@@ -0,0 +1,23 @@
+author: Fathi Boudra <fabo at debian.org>
+
+Qt is built in release mode and strip files by default.
+Set CONFIG+=nostrip to avoid the stripping and
+let dh_strip do it to generate debug packages.
+
+Upstream-Status: Inappropriate [Configuration]
+
+---
+ configure |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/configure
++++ b/configure
+@@ -627,6 +627,8 @@ mkdir -p "$outpath/config.tests"
+ rm -f "$outpath/config.tests/.qmake.cache"
+ cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+ 
++QMakeVar add CONFIG nostrip
++
+ QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+ QMakeVar add decorations "default windows styled"
+ QMakeVar add mouse-drivers "pc"
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index bc33b6b..7a3ba54 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -14,6 +14,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://0001-Added-Openembedded-crossarch-option.patch \
            file://blacklist-diginotar-certs.diff \
            file://fix-translations.patch \
+           file://add_nostrip_for_debug_packages.diff \
            file://g++.conf \
            file://linux.conf \
            file://fix-qtbug-20925.patch \
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index e34ec8d..6b9f97a 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,7 +1,7 @@
 require qt-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
 
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 8c48936..0db090f 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "