summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
diff options
context:
space:
mode:
authorPeter Seiderer <ps.report@gmx.net>2016-06-24 20:02:01 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-06-25 15:37:33 +0200
commit9a55b996651fdfbc40e202cb4dd725dce624ca91 (patch)
tree79f90e7ffbd974feed2f2b305bb5740251741b8a /package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
parentc6ba80ccae02fc8e26f6716480c200ed35efa9d6 (diff)
downloadbuildroot-9a55b996651fdfbc40e202cb4dd725dce624ca91.tar.gz
buildroot-9a55b996651fdfbc40e202cb4dd725dce624ca91.zip
qt5: bump version to 5.6.1-1
Removed obsolete patches: - qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch (upstream committed [1]) - qt5/qt5base/0007-build-with-explicitlib-after-all.patch (upstream committed [2]) - qt5tools/0001-Disable-qdoc-needs-qtdeclarative.patch (fixed upstream by [3]) - qt5webkit/0004-Fix-linking-with-libpthread.patch (upstream committed [4]) [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=e69e69519661954716d59bfa5bbd0626515cfda9 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=523c7e3fd55c853dd424d57f28e225d57439cf89 [3] http://code.qt.io/cgit/qt/qttools.git/commit/?id=2b262fad86ef38a5fa692b4c73e6ec26a5d45a5f [4] http://code.qt.io/cgit/qt/qtwebkit.git/commit/?id=5f359baacdf92fabcece83f0a2b30f74c7c02a3c Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch')
-rw-r--r--package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch b/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
deleted file mode 100644
index b7b6791ab7..0000000000
--- a/package/qt5/qt5webkit/0004-Fix-linking-with-libpthread.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5dd4bb67cfce812fd7686e43616e2069f354a7df Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Mon, 22 Feb 2016 10:57:32 +0100
-Subject: [PATCH] Fix linking with libpthread
-
-WebKit use libpthread directly but is depending on other qt modules
-causing it to be linked against, which might break unless -lpthread
-is last. Instead just add it explicitly after the static libraries.
-
-Upstream-Status: Backport from 5.7 branch
-
-Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
-Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
----
- Tools/qmake/mkspecs/features/default_post.prf | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
-index 67276b7..39bb3f7 100644
---- a/Tools/qmake/mkspecs/features/default_post.prf
-+++ b/Tools/qmake/mkspecs/features/default_post.prf
-@@ -201,6 +201,7 @@ needToLink() {
- linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
- LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
- }
-+ posix:!darwin: LIBS += -lpthread
- }
-
- creating_module {
---
-2.7.1
-
OpenPOWER on IntegriCloud