* [PATCH 1/2] qt4: fix debug symbol stripping
2011-12-07 17:39 [PATCH 0/2] Qt4 fixes Paul Eggleton
@ 2011-12-07 17:39 ` Paul Eggleton
2011-12-07 17:39 ` [PATCH 2/2] qt4: various tidy-ups Paul Eggleton
2011-12-08 18:15 ` [PATCH 0/2] Qt4 fixes Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Paul Eggleton @ 2011-12-07 17:39 UTC (permalink / raw)
To: openembedded-core
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>
---
.../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(-)
create mode 100644 meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
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@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 "
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] qt4: various tidy-ups
2011-12-07 17:39 [PATCH 0/2] Qt4 fixes Paul Eggleton
2011-12-07 17:39 ` [PATCH 1/2] qt4: fix debug symbol stripping Paul Eggleton
@ 2011-12-07 17:39 ` Paul Eggleton
2011-12-08 18:15 ` [PATCH 0/2] Qt4 fixes Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Paul Eggleton @ 2011-12-07 17:39 UTC (permalink / raw)
To: openembedded-core
* -reduce-relocations is already specified in qt4.inc, no need to add it
in qt-${PV}.inc
* Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it
through other inc files.
* Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in
qt4.inc rather than qt-${PV}.inc; these have been supported since at
least 4.5.2 and therefore shouldn't be version-specific.
* Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc
rather than the versioned recipes for the same reason
* Remove redundant setting of LICENSE in qt4-embedded.inc
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/qt-4.7.4.inc | 3 ---
meta/recipes-qt/qt4/qt4-embedded.inc | 3 +--
meta/recipes-qt/qt4/qt4-native.inc | 3 ++-
meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 2 --
meta/recipes-qt/qt4/qt4-x11-free.inc | 4 ++--
meta/recipes-qt/qt4/qt4.inc | 6 +++++-
6 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 7a3ba54..8fda9ce 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -43,9 +43,6 @@ do_configure_prepend() {
${S}/configure
}
-QT_GLFLAGS ?= ""
-QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}"
-
do_compile() {
# Fixup missing wsegl header in some SGX SDKs
if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index c4f6e98..06b2432 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -1,9 +1,8 @@
DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version."
SECTION = "libs"
-LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r37"
+INC_PR = "r38"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index ebbee9b..8a6eb4b 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -31,7 +31,8 @@ EXTRA_OECONF = "-prefix ${prefix} \
-verbose -release \
-embedded -no-freetype -no-glib -no-iconv \
-exceptions -xmlpatterns \
- -qt3support"
+ -qt3support \
+ -no-fast -silent -no-rpath"
# yank default -e, otherwise we get the following error:
# moc_qbuffer.cpp: No such file or directory
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
index 3be4d73..688fb50 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
@@ -8,8 +8,6 @@ SRC_URI += "file://blacklist-diginotar-certs.diff \
# Find the g++.conf/linux.conf in the right directory.
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
TOBUILD := "src/tools/bootstrap ${TOBUILD}"
SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 029c61e..53a44ad 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,12 +5,12 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r34"
+INC_PR = "r35"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
QT_GLFLAGS_qemuppc = "-opengl"
-QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
+QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
QT_BASE_NAME ?= "qt4"
QT_BASE_LIB ?= "libqt"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index bec81b4..3155cbb 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -11,12 +11,16 @@ QT_DISTRO_FLAGS_linuxstdbase = "-sm"
QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite"
+QT_GLFLAGS ?= ""
+
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
-qt-gif -system-libjpeg -system-libpng -system-zlib \
-no-pch -qdbus -stl -glib -phonon -webkit \
+ -xmlpatterns -no-rpath -qt3support -silent \
${QT_SQL_DRIVER_FLAGS} \
- ${QT_DISTRO_FLAGS} "
+ ${QT_DISTRO_FLAGS} \
+ ${QT_GLFLAGS}"
EXTRA_OEMAKE = "-e"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] Qt4 fixes
2011-12-07 17:39 [PATCH 0/2] Qt4 fixes Paul Eggleton
2011-12-07 17:39 ` [PATCH 1/2] qt4: fix debug symbol stripping Paul Eggleton
2011-12-07 17:39 ` [PATCH 2/2] qt4: various tidy-ups Paul Eggleton
@ 2011-12-08 18:15 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-12-08 18:15 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton
On 12/07/2011 09:39 AM, Paul Eggleton wrote:
> A couple of fixes that I took the opportunity to do while I was testing
> building Qt 4.8.0 RC1. (Incidentally I will post the 4.8.0 recipes once
> the release is final, which reportedly should be within the next few
> weeks.)
>
> The following changes since commit 493746f1d7f1410284880203c1ac462d61ab5299:
>
> matchbox-session-sato: respect VIRTUAL-RUNTIME_initscripts settings (2011-12-07 12:42:22 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib paule/qt4-debug
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-debug
>
> Paul Eggleton (2):
> qt4: fix debug symbol stripping
> qt4: various tidy-ups
>
> .../qt4/files/add_nostrip_for_debug_packages.diff | 23 ++++++++++++++++++++
> meta/recipes-qt/qt4/qt-4.7.4.inc | 4 +--
> meta/recipes-qt/qt4/qt4-embedded.inc | 3 +-
> meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 2 +-
> meta/recipes-qt/qt4/qt4-native.inc | 3 +-
> meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 2 -
> meta/recipes-qt/qt4/qt4-x11-free.inc | 4 +-
> meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 6 ++++-
> 9 files changed, 36 insertions(+), 13 deletions(-)
> create mode 100644 meta/recipes-qt/qt4/files/add_nostrip_for_debug_packages.diff
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread