[GTK] Explicitly link against librt
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Nov 2012 22:00:15 +0000 (22:00 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Nov 2012 22:00:15 +0000 (22:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=103194

Patch by Kalev Lember <kalevlember@gmail.com> on 2012-11-26
Reviewed by Martin Robinson.

Fixes broken build with undefined references to shm_open / shm_unlink
symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt.

.:

* configure.ac:

Source/WebKit2:

* GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@135761 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
configure.ac

index 63431ff..3e3b936 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-11-26  Kalev Lember  <kalevlember@gmail.com>
+
+        [GTK] Explicitly link against librt
+        https://bugs.webkit.org/show_bug.cgi?id=103194
+
+        Reviewed by Martin Robinson.
+
+        Fixes broken build with undefined references to shm_open / shm_unlink
+        symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt.
+
+        * configure.ac:
+
 2012-11-26  Laszlo Gombos  <l.gombos@samsung.com>
 
         [CMake] Allow user specified compiler flags to take precedence
index 781cb89..f4df6d4 100644 (file)
@@ -1,3 +1,15 @@
+2012-11-26  Kalev Lember  <kalevlember@gmail.com>
+
+        [GTK] Explicitly link against librt
+        https://bugs.webkit.org/show_bug.cgi?id=103194
+
+        Reviewed by Martin Robinson.
+
+        Fixes broken build with undefined references to shm_open / shm_unlink
+        symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt.
+
+        * GNUmakefile.am:
+
 2012-11-26  Christophe Dumez  <christophe.dumez@intel.com>
 
         [EFL][WK2] Add setting to enable / disable HTML5 local storage functionality
index 097cdc1..ff5ff1f 100644 (file)
@@ -566,6 +566,7 @@ Programs_WebKitPluginProcess_LDADD += \
        $(PANGO_LIBS) \
        $(PNG_LIBS) \
        $(SHLWAPI_LIBS) \
+       $(SHM_LIBS) \
        $(SQLITE3_LIBS) \
        $(UNICODE_LIBS) \
        $(XRENDER_LIBS) \
index 4e1f0e8..97980e4 100644 (file)
@@ -1118,6 +1118,13 @@ if test "$enable_webkit2" = "yes"; then
    if test "$have_gtk_unix_printing" = "yes"; then
        AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
    fi
+
+   # On some Linux/Unix platforms, shm_* may only be available if linking
+   # against librt
+   if test "$os_win32" = "no"; then
+       AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
+       AC_SUBST(SHM_LIBS)
+   fi
 fi
 
 # Plugin Process