Title: [135761] trunk
- Revision
- 135761
- Author
- mrobin...@webkit.org
- Date
- 2012-11-26 14:00:15 -0800 (Mon, 26 Nov 2012)
Log Message
[GTK] Explicitly link against librt
https://bugs.webkit.org/show_bug.cgi?id=103194
Patch by Kalev Lember <kalevlem...@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:
Modified Paths
Diff
Modified: trunk/ChangeLog (135760 => 135761)
--- trunk/ChangeLog 2012-11-26 21:44:10 UTC (rev 135760)
+++ trunk/ChangeLog 2012-11-26 22:00:15 UTC (rev 135761)
@@ -1,3 +1,15 @@
+2012-11-26 Kalev Lember <kalevlem...@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.gom...@samsung.com>
[CMake] Allow user specified compiler flags to take precedence
Modified: trunk/Source/WebKit2/ChangeLog (135760 => 135761)
--- trunk/Source/WebKit2/ChangeLog 2012-11-26 21:44:10 UTC (rev 135760)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-26 22:00:15 UTC (rev 135761)
@@ -1,3 +1,15 @@
+2012-11-26 Kalev Lember <kalevlem...@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.du...@intel.com>
[EFL][WK2] Add setting to enable / disable HTML5 local storage functionality
Modified: trunk/Source/WebKit2/GNUmakefile.am (135760 => 135761)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-11-26 21:44:10 UTC (rev 135760)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-11-26 22:00:15 UTC (rev 135761)
@@ -566,6 +566,7 @@
$(PANGO_LIBS) \
$(PNG_LIBS) \
$(SHLWAPI_LIBS) \
+ $(SHM_LIBS) \
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
$(XRENDER_LIBS) \
Modified: trunk/configure.ac (135760 => 135761)
--- trunk/configure.ac 2012-11-26 21:44:10 UTC (rev 135760)
+++ trunk/configure.ac 2012-11-26 22:00:15 UTC (rev 135761)
@@ -1118,6 +1118,13 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
