Update Buildroot from 17.02.4 -> 17.02.5
This commit is contained in:
@@ -1,53 +0,0 @@
|
||||
[CMake] Build failure with GCC 6 (fatal error: stdlib.h: No such file or directory)
|
||||
|
||||
https://bugs.webkit.org/show_bug.cgi?id=161697
|
||||
|
||||
Reviewed by Michael Catanzaro.
|
||||
|
||||
Get the list of system includes from GCC and add it to the CMake
|
||||
list of implicit includes. This way, CMake will filter any of this
|
||||
directories from the list of includes when calling the compiler.
|
||||
|
||||
This avoids an issue with GCC 6 that causes build failures when
|
||||
including the default include path as a system include (-isystem).
|
||||
|
||||
Upstream, from: https://trac.webkit.org/changeset/205672
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
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 ()
|
||||
|
||||
@@ -9,6 +9,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
|
||||
# Disabled on SuperH because of segfault
|
||||
depends on BR2_USE_MMU # libglib2
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
|
||||
|
||||
comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9"
|
||||
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
|
||||
@@ -30,6 +31,7 @@ config BR2_PACKAGE_WEBKITGTK
|
||||
select BR2_PACKAGE_HARFBUZZ
|
||||
select BR2_PACKAGE_ICU
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_LIBSECRET
|
||||
select BR2_PACKAGE_LIBSOUP
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://www.webkitgtk.org/releases/webkitgtk-2.12.5.tar.xz.sha1
|
||||
sha1 2d73fd5b47c68c73aea8b3d7b88acc8e62bdb99c webkitgtk-2.12.5.tar.xz
|
||||
# Calculated based on the hash above
|
||||
sha256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 webkitgtk-2.12.5.tar.xz
|
||||
# From https://webkitgtk.org/releases/webkitgtk-2.16.6.tar.xz.sums
|
||||
md5 0e2d142a586e4ff79cf0324f4fdbf20c webkitgtk-2.16.6.tar.xz
|
||||
sha1 f7fca3fbac3dc99e39f353a6df250635e684c922 webkitgtk-2.16.6.tar.xz
|
||||
sha256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 webkitgtk-2.16.6.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WEBKITGTK_VERSION = 2.12.5
|
||||
WEBKITGTK_VERSION = 2.16.6
|
||||
WEBKITGTK_SITE = http://www.webkitgtk.org/releases
|
||||
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
|
||||
WEBKITGTK_INSTALL_STAGING = YES
|
||||
@@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \
|
||||
Source/WebCore/LICENSE-APPLE \
|
||||
Source/WebCore/LICENSE-LGPL-2.1
|
||||
WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
|
||||
enchant harfbuzz icu jpeg libgtk3 libsecret libsoup \
|
||||
enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
|
||||
libxml2 libxslt sqlite webp
|
||||
WEBKITGTK_CONF_OPTS = \
|
||||
-DENABLE_API_TESTS=OFF \
|
||||
|
||||
Reference in New Issue
Block a user