ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt4: Workarounds for missing C++11 compatibility 

Since we switched to using C++11 by default, the webkit-related
parts of qt4 failed to compile because of C++11 compatibility
issues. This patch disables the use of C++11 for the offenders.
This commit is contained in:
Norman Feske 2013-11-07 14:23:11 +01:00
parent d65220bcf2
commit 1953acae77
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qt4/lib/mk/qt_jscore.mk
View File

@ -11,6 +11,13 @@ CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH
# use default warning level to avoid noise when compiling contrib code
CC_WARN =
# some parts of the library are not C++11 compatible
CC_CXX_OPT_STD =
# StackBounds includes Genode headers, which rely on C++11. Hence, we need
# to selectively enable C++11 for this compilation unit.
CC_OPT_StackBounds = -std=gnu++11
include $(REP_DIR)/lib/mk/qt_jscore_generated.inc
include $(REP_DIR)/lib/mk/qt.inc

3
qt4/lib/mk/qt_webcore.mk
View File

@ -13,6 +13,9 @@ CC_WARN = -Wno-deprecated-declarations
CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast
# some parts of the library are not C++11 compatible
CC_CXX_OPT_STD =
include $(REP_DIR)/lib/mk/qt_webcore_generated.inc
include $(REP_DIR)/lib/mk/qt.inc

3
qt4/lib/mk/qt_webkit.mk
View File

@ -13,6 +13,9 @@ CC_WARN = -Wno-deprecated-declarations
CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast
# some parts of the library are not C++11 compatible
CC_CXX_OPT_STD =
include $(REP_DIR)/lib/mk/qt_webkit_generated.inc
include $(REP_DIR)/lib/mk/qt.inc