Title: [176519] trunk/Source/WebKit2
- Revision
- 176519
- Author
- [email protected]
- Date
- 2014-11-24 06:49:39 -0800 (Mon, 24 Nov 2014)
Log Message
Webkit2 doesnt build on powerpc 32 bits
https://bugs.webkit.org/show_bug.cgi?id=130837
Reviewed by Carlos Garcia Campos.
Check if libatomic is needed in order to use std::atomic, and add
it to the list of WebKit2 libraries.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176518 => 176519)
--- trunk/Source/WebKit2/ChangeLog 2014-11-24 12:50:17 UTC (rev 176518)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-24 14:49:39 UTC (rev 176519)
@@ -1,3 +1,15 @@
+2014-11-24 Alberto Garcia <[email protected]>
+
+ Webkit2 doesnt build on powerpc 32 bits
+ https://bugs.webkit.org/show_bug.cgi?id=130837
+
+ Reviewed by Carlos Garcia Campos.
+
+ Check if libatomic is needed in order to use std::atomic, and add
+ it to the list of WebKit2 libraries.
+
+ * PlatformGTK.cmake:
+
2014-11-24 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.7.2 release.
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (176518 => 176519)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-11-24 12:50:17 UTC (rev 176518)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-11-24 14:49:39 UTC (rev 176519)
@@ -467,6 +467,15 @@
NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp
)
+file(WRITE ${CMAKE_BINARY_DIR}/test_atomic.cpp
+ "#include <atomic>\n"
+ "int main() { std::atomic<int64_t> i(0); i++; return 0; }\n")
+try_compile(ATOMIC_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomic.cpp)
+if (NOT ATOMIC_BUILD_SUCCEEDED)
+ list(APPEND WebKit2_LIBRARIES atomic)
+endif ()
+file(REMOVE ${CMAKE_BINARY_DIR}/test_atomic.cpp)
+
set(SharedWebKit2Libraries
${WebKit2_LIBRARIES}
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
