forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-qt/qtwebkit: fix linking against libpthread
Gentoo-Bug: 581282 Package-Manager: portage-2.2.28
- Loading branch information
Showing
2 changed files
with
33 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001 | ||
From: Allan Sandfeld Jensen <[email protected]> | ||
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. | ||
|
||
Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 | ||
Reviewed-by: Simon Hausmann <[email protected]> | ||
(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) | ||
Reviewed-by: Allan Sandfeld Jensen <[email protected]> | ||
--- | ||
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.8.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters