diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-12-06 16:51:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-08 15:14:05 +0000 |
| commit | c2f6dc09a7663f69308558553be9420df3a81b6b (patch) | |
| tree | b4606eb6fa5ef2e16906b6e569f80d4d2b78ead6 /meta/recipes-qt | |
| parent | c4da803ef78322b758380eb0af0dcb73cae6553c (diff) | |
| download | openembedded-core-c2f6dc09a7663f69308558553be9420df3a81b6b.tar.gz openembedded-core-c2f6dc09a7663f69308558553be9420df3a81b6b.tar.bz2 openembedded-core-c2f6dc09a7663f69308558553be9420df3a81b6b.zip | |
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@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff | 23 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 2 | ||||
| -rw-r--r-- | 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 0000000000..774cb997a4 --- /dev/null +++ b/meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff @@ -0,0 +1,23 @@ +author: Fathi Boudra <fabo@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 bc33b6b1b8..7a3ba54cc8 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 e34ec8d5db..6b9f97a356 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 8c489362d7..0db090f8e0 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 " |