Title: [105305] trunk
- Revision
- 105305
- Author
- commit-qu...@webkit.org
- Date
- 2012-01-18 12:12:51 -0800 (Wed, 18 Jan 2012)
Log Message
[Qt][WK2] Broken build with undefined reference to shm_open and shm_unlink
https://bugs.webkit.org/show_bug.cgi?id=76538
Patch by Luciano Wolf <luciano.w...@openbossa.org> on 2012-01-18
Reviewed by Tor Arne Vestbø.
The -lrt parameter was coming before -lWebKit2 during linkage.
Moved rt lib inclusion from Source/api.pri to WebKit2.pri as it should be aware
of its own dependencies instead of letting WebKit guess about. Letting
it on api.pri can lead to a wrong parameter's order during linker phase.
Ubuntu 11.10 was giving errors about SharedMemory (shm_open and
shm_unlink undefined symbols).
.:
* Source/api.pri:
Source/WebKit2:
The issue was fixed with the help of Aloisio Almeida and Lauro Venancio.
* WebKit2.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (105304 => 105305)
--- trunk/ChangeLog 2012-01-18 19:59:39 UTC (rev 105304)
+++ trunk/ChangeLog 2012-01-18 20:12:51 UTC (rev 105305)
@@ -1,3 +1,20 @@
+2012-01-18 Luciano Wolf <luciano.w...@openbossa.org>
+
+ [Qt][WK2] Broken build with undefined reference to shm_open and shm_unlink
+ https://bugs.webkit.org/show_bug.cgi?id=76538
+
+ Reviewed by Tor Arne Vestbø.
+
+ The -lrt parameter was coming before -lWebKit2 during linkage.
+
+ Moved rt lib inclusion from Source/api.pri to WebKit2.pri as it should be aware
+ of its own dependencies instead of letting WebKit guess about. Letting
+ it on api.pri can lead to a wrong parameter's order during linker phase.
+ Ubuntu 11.10 was giving errors about SharedMemory (shm_open and
+ shm_unlink undefined symbols).
+
+ * Source/api.pri:
+
2012-01-18 Balazs Kelemen <kbal...@webkit.org>
[Qt] Consolidate layout test crash logging
Modified: trunk/Source/WebKit2/ChangeLog (105304 => 105305)
--- trunk/Source/WebKit2/ChangeLog 2012-01-18 19:59:39 UTC (rev 105304)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-18 20:12:51 UTC (rev 105305)
@@ -1,3 +1,22 @@
+2012-01-18 Luciano Wolf <luciano.w...@openbossa.org>
+
+ [Qt][WK2] Broken build with undefined reference to shm_open and shm_unlink
+ https://bugs.webkit.org/show_bug.cgi?id=76538
+
+ Reviewed by Tor Arne Vestbø.
+
+ The -lrt parameter was coming before -lWebKit2 during linkage.
+
+ Moved rt lib inclusion from Source/api.pri to WebKit2.pri as it should be aware
+ of its own dependencies instead of letting WebKit guess about. Letting
+ it on api.pri can lead to a wrong parameter's order during linker phase.
+ Ubuntu 11.10 was giving errors about SharedMemory (shm_open and
+ shm_unlink undefined symbols).
+
+ The issue was fixed with the help of Aloisio Almeida and Lauro Venancio.
+
+ * WebKit2.pri:
+
2012-01-18 Carlos Garnacho <carl...@gnome.org>
[GTK] Listen to GDK_SCROLL_MASK
Modified: trunk/Source/WebKit2/WebKit2.pri (105304 => 105305)
--- trunk/Source/WebKit2/WebKit2.pri 2012-01-18 19:59:39 UTC (rev 105304)
+++ trunk/Source/WebKit2/WebKit2.pri 2012-01-18 20:12:51 UTC (rev 105305)
@@ -60,3 +60,8 @@
INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/Api
INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR
+
+linux-g++*: {
+ # -lrt is required for shm_open and shm_unlink.
+ LIBS += -lrt
+}
Modified: trunk/Source/api.pri (105304 => 105305)
--- trunk/Source/api.pri 2012-01-18 19:59:39 UTC (rev 105304)
+++ trunk/Source/api.pri 2012-01-18 20:12:51 UTC (rev 105305)
@@ -224,9 +224,4 @@
linux-g++*: {
PRE_TARGETDEPS += $$PWD/qtwebkit-export.map
QMAKE_LFLAGS += -Wl,--version-script=$$PWD/qtwebkit-export.map
-
- !no_webkit2: {
- # -lrt is required for shm_open and shm_unlink.
- LIBS += -lrt
- }
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
