diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch deleted file mode 100644 index c5e6ac52..00000000 --- a/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 5dd4bb67cfce812fd7686e43616e2069f354a7df Mon Sep 17 00:00:00 2001 | ||
2 | From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | ||
3 | Date: Mon, 22 Feb 2016 10:57:32 +0100 | ||
4 | Subject: [PATCH] Fix linking with libpthread | ||
5 | |||
6 | WebKit use libpthread directly but is depending on other qt modules | ||
7 | causing it to be linked against, which might break unless -lpthread | ||
8 | is last. Instead just add it explicitly after the static libraries. | ||
9 | |||
10 | Upstream-Status: Backport from 5.7 branch | ||
11 | |||
12 | Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 | ||
13 | Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> | ||
14 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
15 | --- | ||
16 | Tools/qmake/mkspecs/features/default_post.prf | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf | ||
20 | index 67276b7..39bb3f7 100644 | ||
21 | --- a/Tools/qmake/mkspecs/features/default_post.prf | ||
22 | +++ b/Tools/qmake/mkspecs/features/default_post.prf | ||
23 | @@ -201,6 +201,7 @@ needToLink() { | ||
24 | linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir)) | ||
25 | LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs) | ||
26 | } | ||
27 | + posix:!darwin: LIBS += -lpthread | ||
28 | } | ||
29 | |||
30 | creating_module { | ||
31 | -- | ||
32 | 2.7.1 | ||
33 | |||