diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:00:58 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:26 +0100 |
| commit | a0a29221c8df7c277139b0c875330f08cb2bdea3 (patch) | |
| tree | 967c8777a198f33333e458ca8579fe896c784e99 /meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch | |
| parent | 248e9f48c77212372b50074f0a475a16bb8db4be (diff) | |
| download | ast2050-yocto-poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.zip ast2050-yocto-poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.tar.gz | |
qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch new file mode 100644 index 0000000..6efbaf5 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch @@ -0,0 +1,30 @@ +Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific +extension to the g++ and causes upstream GCC to throw an error. + +Upstream-Status: Pending + +Signed-off-by: Ken Werner <ken.werner@linaro.org> + +Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri +=================================================================== +--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri +@@ -3,12 +3,12 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} ++#linux-g++ { ++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { ++# message(Using gold linker) ++# QMAKE_LFLAGS+=-fuse-ld=gold ++#} ++#} + + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 |
