webkitgtk: add upstream patch for failed gcc6 builds
PATCH 1/1 webkitgtk: add upstream patch for failed gcc6 builds
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/webkitgtk/0001-fix-gcc6-builds.patch | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/webkitgtk/0001-fix-gcc6-builds.patch
package/webkitgtk/0001-fix-gcc6-builds.patch new file +40 -0
@@ -0,0 +1,40 @@ +Upstream, from: https://trac.webkit.org/changeset/205672 + +Signed-off-by: Gustavo Zacarias <[email protected]> + +Index: trunk/Source/cmake/OptionsCommon.cmake +=================================================================== +--- trunk/Source/cmake/OptionsCommon.cmake (revision 204084) ++++ trunk/Source/cmake/OptionsCommon.cmake (revision 205672) +@@ -36,4 +36,31 @@ + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics") ++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 () +
Signature · 1 line
2.7.3
PATCH 1/1 webkitgtk: add upstream patch for failed gcc6 builds
Hello,
package/webkitgtk/0001-fix-gcc6-builds.patch line 3
Quoted 9 lines · Gustavo Zacarias
package/webkitgtk/0001-fix-gcc6-builds.patch new file +3
-0@@ -0,0 +1,40 @@ +Upstream, from: https://trac.webkit.org/changeset/205672 + +Signed-off-by: Gustavo Zacarias <[email protected]>
This description is a bit short, so I copy/pasted the description of the upstream patch here.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com