|
@@ -0,0 +1,36 @@
|
|
|
+--- webkitgtk-2.14.2.orig/Source/cmake/OptionsCommon.cmake 2016-11-03 08:04:21.000000000 +0100
|
|
|
++++ webkitgtk-2.14.2/Source/cmake/OptionsCommon.cmake 2016-11-23 12:23:24.503018028 +0100
|
|
|
+@@ -64,6 +64,33 @@ if (CMAKE_COMPILER_IS_GNUCXX)
|
|
|
+ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
|
|
|
+ endif ()
|
|
|
+
|
|
|
++# Ensure that the default include system directories are added to the list of CMake implicit includes.
|
|
|
++# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem).
|
|
|
++# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697
|
|
|
++macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result)
|
|
|
++ file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n")
|
|
|
++ separate_arguments(_buildFlags UNIX_COMMAND "${_flags}")
|
|
|
++ execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy
|
|
|
++ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET
|
|
|
++ ERROR_VARIABLE _gccOutput)
|
|
|
++ file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")
|
|
|
++ if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list")
|
|
|
++ set(${_result} ${CMAKE_MATCH_1})
|
|
|
++ string(REPLACE "\n" " " ${_result} "${${_result}}")
|
|
|
++ separate_arguments(${_result})
|
|
|
++ endif ()
|
|
|
++endmacro()
|
|
|
++
|
|
|
++if (CMAKE_COMPILER_IS_GNUCC)
|
|
|
++ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS)
|
|
|
++ set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
|
|
|
++endif ()
|
|
|
++
|
|
|
++if (CMAKE_COMPILER_IS_GNUCXX)
|
|
|
++ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS)
|
|
|
++ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
|
|
|
++endif ()
|
|
|
++
|
|
|
+ # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux.
|
|
|
+ # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53.
|
|
|
+ # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual)
|