2016-02-19 16:05:00 +01:00
|
|
|
From 8b666dae1a0f9454c7bb32386b4bed027b481426 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Michael Catanzaro <mcatanzaro@igalia.com>
|
|
|
|
|
Date: Mon, 28 Dec 2015 21:53:54 -0600
|
|
|
|
|
Subject: [PATCH] Disable GCC version check
|
|
|
|
|
|
|
|
|
|
For openSUSE to compile with GCC 4.8, with -DENABLE_INDEXED_DATABASE=OFF
|
|
|
|
|
and -DENABLE_DATABASE_PROCESS=OFF. It will probably work. The GCC 4.9
|
|
|
|
|
requirement is because GCC 4.8 cannot handle some of the database
|
|
|
|
|
process code.
|
|
|
|
|
---
|
|
|
|
|
Source/cmake/OptionsGTK.cmake | 7 -------
|
|
|
|
|
1 file changed, 7 deletions(-)
|
|
|
|
|
|
2016-09-30 14:02:52 +02:00
|
|
|
Index: webkitgtk-2.14.0/Source/cmake/OptionsGTK.cmake
|
2016-02-19 16:05:00 +01:00
|
|
|
===================================================================
|
2016-09-30 14:02:52 +02:00
|
|
|
--- webkitgtk-2.14.0.orig/Source/cmake/OptionsGTK.cmake
|
|
|
|
|
+++ webkitgtk-2.14.0/Source/cmake/OptionsGTK.cmake
|
|
|
|
|
@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 0)
|
2016-02-19 16:05:00 +01:00
|
|
|
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
|
|
|
|
|
set(WEBKITGTK_API_VERSION 4.0)
|
|
|
|
|
|
|
|
|
|
-# IndexedDB support requires GCC 4.9, see https://bugs.webkit.org/show_bug.cgi?id=98932.
|
|
|
|
|
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
|
|
|
|
- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")
|
|
|
|
|
- message(FATAL_ERROR "GCC 4.9.0 is required to build WebKitGTK+, use a newer GCC version or clang")
|
|
|
|
|
- endif ()
|
|
|
|
|
-endif ()
|
|
|
|
|
-
|
|
|
|
|
# Libtool library version, not to be confused with API version.
|
|
|
|
|
# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
|
2016-09-30 14:02:52 +02:00
|
|
|
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 51 7 14)
|
|
|
|
|
Index: webkitgtk-2.14.0/Source/WTF/wtf/Compiler.h
|
2016-02-19 16:05:00 +01:00
|
|
|
===================================================================
|
2016-09-30 14:02:52 +02:00
|
|
|
--- webkitgtk-2.14.0.orig/Source/WTF/wtf/Compiler.h
|
|
|
|
|
+++ webkitgtk-2.14.0/Source/WTF/wtf/Compiler.h
|
|
|
|
|
@@ -89,8 +89,8 @@
|
2016-02-19 16:05:00 +01:00
|
|
|
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
|
|
|
|
|
#define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
|
|
|
|
|
|
|
|
|
|
-#if !GCC_VERSION_AT_LEAST(4, 9, 0)
|
|
|
|
|
-#error "Please use a newer version of GCC. WebKit requires GCC 4.9.0 or newer to compile."
|
|
|
|
|
+#if !GCC_VERSION_AT_LEAST(4, 7, 0)
|
|
|
|
|
+#error "Please use a newer version of GCC. WebKit requires GCC 4.7.0 or newer to compile."
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
|
