From 42b3fc6dd3c8a1c608306aa85ca5e5a77d94ee1d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 26 Sep 2012 21:18:02 +0200 Subject: qt4: add 4.8.3 version with negative D_P * rebased patches, 3 patches are resolved upstream: 0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b 0022-webkit-fix-conflicting-types.patch resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1 (From OE-Core rev: b9fc4928bb93ad720c47920db3869d860c531d0a) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- ...0020-webkit-disable-the-fuse-ld-gold-flag.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch (limited to 'meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch') diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch new file mode 100644 index 0000000000..1e07a54290 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.3/0020-webkit-disable-the-fuse-ld-gold-flag.patch @@ -0,0 +1,41 @@ +From a10ba547001f4a4ba0ae313a4e9c2c0b5bb36a09 Mon Sep 17 00:00:00 2001 +From: Ken Werner +Date: Wed, 26 Sep 2012 20:55:21 +0200 +Subject: [PATCH 20/20] webkit: 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 +Signed-off-by: Martin Jansa +--- + src/3rdparty/webkit/Source/common.pri | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri +index 0f62e14..d81a1f0 100644 +--- a/src/3rdparty/webkit/Source/common.pri ++++ b/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 +-- +1.7.12 + -- cgit v1.2.3-54-g00ecf