diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-19 19:48:00 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-19 19:48:00 +0200 |
| commit | 00d2002b110a15faf53d022876b2005541d024f7 (patch) | |
| tree | bf40bd995839d79e1f05b828462ebf536c2181c1 | |
| parent | c1fbf9f85e5947780b4e6a87ac310cf6b55d4f5a (diff) | |
| download | ptxdist-00d2002b110a15faf53d022876b2005541d024f7.tar.gz ptxdist-00d2002b110a15faf53d022876b2005541d024f7.tar.xz | |
[qt4] add hack for linker crash on ppc
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/qt-everywhere-opensource-src-4.6.3/ppc-hack.diff | 28 | ||||
| -rw-r--r-- | patches/qt-everywhere-opensource-src-4.6.3/series | 1 | ||||
| -rw-r--r-- | rules/qt4.make | 3 |
3 files changed, 32 insertions, 0 deletions
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/ppc-hack.diff b/patches/qt-everywhere-opensource-src-4.6.3/ppc-hack.diff new file mode 100644 index 000000000..e15829383 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/ppc-hack.diff @@ -0,0 +1,28 @@ +Subject: Hack: disable -Wl,--gc-sections on ppc +From: Michael Olbrich <m.olbrich@pengutronix.de> + +The linker in our toolchain crashes with -Wl,--gc-sections on PowerPC. +This patch removes this option and related options when building +for PowerPC. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +--- + src/3rdparty/webkit/WebCore/WebCore.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: b/src/3rdparty/webkit/WebCore/WebCore.pro +=================================================================== +--- a/src/3rdparty/webkit/WebCore/WebCore.pro ++++ b/src/3rdparty/webkit/WebCore/WebCore.pro +@@ -65,8 +65,8 @@ unix { + lessThan(QT_MINOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtXml + } + +-unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections ++unix:!ppc:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections ++unix:!ppc:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections + + CONFIG(release):!CONFIG(QTDIR_build) { + contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols diff --git a/patches/qt-everywhere-opensource-src-4.6.3/series b/patches/qt-everywhere-opensource-src-4.6.3/series index 6a3c7a632..d98b501b6 100644 --- a/patches/qt-everywhere-opensource-src-4.6.3/series +++ b/patches/qt-everywhere-opensource-src-4.6.3/series @@ -4,3 +4,4 @@ hide-cursor-at-startup.diff fix-examples.diff fix-qws-dnd.diff fix-host-zlib.diff +ppc-hack.diff diff --git a/rules/qt4.make b/rules/qt4.make index 31e59a4b1..a73789e7f 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -68,6 +68,9 @@ QT4_ARCH = armv6 else QT4_ARCH = $(call remove_quotes, $(PTXCONF_ARCH_STRING)) endif +ifeq ($(QT4_ARCH),ppc) +QT4_ARCH = powerpc +endif # # autoconf |