Changeset 105305 in webkit

Timestamp:

Jan 18, 2012, 12:12:51 PM (13 years ago)

Author:

commit-queue@webkit.org

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 Miguel Wolf> 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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebKit2.pri (modified) (1 diff)
• Source/api.pri (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-01-18  Luciano Wolf  <luciano.wolf@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  <kbalazs@webkit.org>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-18  Luciano Wolf  <luciano.wolf@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  <carlosg@gnome.org>
 

trunk/Source/WebKit2/WebKit2.pri

@@ -61 +61 @@
 
 INCLUDEPATH += $$WEBKIT2_GENERATED_SOURCES_DIR
+
+linux-g++*: {
+    # -lrt is required for shm_open and shm_unlink.
+    LIBS += -lrt
+}

trunk/Source/api.pri

@@ -225 +225 @@
     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
-    }
-}
+}