Title: [140990] trunk
- Revision
- 140990
- Author
- [email protected]
- Date
- 2013-01-28 12:19:14 -0800 (Mon, 28 Jan 2013)
Log Message
[EFL] Quit debug build without -DSHARED_CORE=ON
https://bugs.webkit.org/show_bug.cgi?id=104773
Patch by Halton Huo <[email protected]> on 2013-01-28
Reviewed by Laszlo Gombos.
Debug build without -DSHARED_CORE=ON will fail because libwebcore_efl.a
is too big (>4G) to archive. The solution is simply to abort cmake in
this condition and notify developer.
* CMakeLists.txt:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsCommon.cmake:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (140989 => 140990)
--- trunk/CMakeLists.txt 2013-01-28 20:13:51 UTC (rev 140989)
+++ trunk/CMakeLists.txt 2013-01-28 20:19:14 UTC (rev 140990)
@@ -7,6 +7,7 @@
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
set(CMAKE_BUILD_TYPE Release)
endif ()
+string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
# -----------------------------------------------------------------------------
# Default library type
Modified: trunk/ChangeLog (140989 => 140990)
--- trunk/ChangeLog 2013-01-28 20:13:51 UTC (rev 140989)
+++ trunk/ChangeLog 2013-01-28 20:19:14 UTC (rev 140990)
@@ -1,3 +1,18 @@
+2013-01-28 Halton Huo <[email protected]>
+
+ [EFL] Quit debug build without -DSHARED_CORE=ON
+ https://bugs.webkit.org/show_bug.cgi?id=104773
+
+ Reviewed by Laszlo Gombos.
+
+ Debug build without -DSHARED_CORE=ON will fail because libwebcore_efl.a
+ is too big (>4G) to archive. The solution is simply to abort cmake in
+ this condition and notify developer.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsCommon.cmake:
+
2013-01-28 Renata Hodovan <[email protected]>
[WK2] Putting QtWebProcess into a chrooted sandbox
Modified: trunk/Source/cmake/OptionsCommon.cmake (140989 => 140990)
--- trunk/Source/cmake/OptionsCommon.cmake 2013-01-28 20:13:51 UTC (rev 140989)
+++ trunk/Source/cmake/OptionsCommon.cmake 2013-01-28 20:19:14 UTC (rev 140990)
@@ -27,7 +27,7 @@
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
string(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_HOST_SYSTEM_PROCESSOR)
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${LOWERCASE_CMAKE_HOST_SYSTEM_PROCESSOR}" MATCHES "(i[3-6]86|x86)" AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${LOWERCASE_CMAKE_HOST_SYSTEM_PROCESSOR}" MATCHES "(i[3-6]86|x86)" AND "${CMAKE_BUILD_TYPE}" STREQUAL "debug")
# To avoid out of memory when building with debug option in 32bit system.
# See https://bugs.webkit.org/show_bug.cgi?id=77327
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-keep-memory ${CMAKE_SHARED_LINKER_FLAGS}")
Modified: trunk/Source/cmake/OptionsEfl.cmake (140989 => 140990)
--- trunk/Source/cmake/OptionsEfl.cmake 2013-01-28 20:13:51 UTC (rev 140989)
+++ trunk/Source/cmake/OptionsEfl.cmake 2013-01-28 20:19:14 UTC (rev 140990)
@@ -9,6 +9,10 @@
set(ENABLE_WEBKIT2 ON)
endif ()
+if (${CMAKE_BUILD_TYPE} STREQUAL "debug" AND NOT SHARED_CORE)
+ message(FATAL_ERROR "Turn on the SHARED_CORE flag to make a debug build - e.g.\n build-webkit --efl --debug --cmakeargs=\"-DSHARED_CORE=ON\".\n")
+endif ()
+
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Sqlite REQUIRED)
@@ -215,7 +219,7 @@
set(CPACK_SOURCE_GENERATOR TBZ2)
# Optimize binary size for release builds by removing dead sections on unix/gcc
-if (CMAKE_BUILD_TYPE STREQUAL Release AND CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
+if (CMAKE_BUILD_TYPE STREQUAL release AND CMAKE_COMPILER_IS_GNUCC AND UNIX AND NOT APPLE)
set(CMAKE_C_FLAGS "-ffunction-sections -fdata-sections ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-ffunction-sections -fdata-sections ${CMAKE_CXX_FLAGS}")
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--gc-sections ${CMAKE_SHARED_LINKER_FLAGS}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
