Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[GTK] Explicitly link against librt

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: http://svn.webkit.org/repository/webkit/trunk@135761 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
commit 35b1ae6cdb8af8c3b3283e84c0f55ca03f1a2e85 1 parent 7e5238d
mrobinson@webkit.org authored
View
12 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
View
12 Source/WebKit2/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.
+
+ * GNUmakefile.am:
+
2012-11-26 Christophe Dumez <christophe.dumez@intel.com>
[EFL][WK2] Add setting to enable / disable HTML5 local storage functionality
View
1  Source/WebKit2/GNUmakefile.am
@@ -566,6 +566,7 @@ Programs_WebKitPluginProcess_LDADD += \
$(PANGO_LIBS) \
$(PNG_LIBS) \
$(SHLWAPI_LIBS) \
+ $(SHM_LIBS) \
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
$(XRENDER_LIBS) \
View
7 configure.ac
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.