File do-not-force-optimization-level.diff of Package libQtWebKit4
--- configure.ac.orig 2011-12-05 22:57:09.451158463 +0100
+++ configure.ac 2011-12-05 22:57:37.125587346 +0100
@@ -942,15 +942,6 @@
AC_DEFINE([NDEBUG], [1], [Define to disable debugging features])
fi
-# Add the appropriate 'O' level for optimized builds
-if test "$enable_optimizations" = "yes"; then
- CXXFLAGS="$CXXFLAGS -O2"
- CFLAGS="$CFLAGS -O2"
-else
- CXXFLAGS="$CXXFLAGS -O0"
- CFLAGS="$CFLAGS -O0"
-fi
-
PKG_CHECK_MODULES([LIBSOUP],
[libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION])
AC_SUBST([LIBSOUP_CFLAGS])
--- Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py.orig 2011-12-06 07:19:10.508957427 +0100
+++ Source/ThirdParty/gyp/test/cxxflags/gyptest-cxxflags.py 2011-12-06 07:19:19.155091506 +0100
@@ -28,7 +28,6 @@
try:
PushEnv()
- os.environ['CXXFLAGS'] = '-O0'
test.run_gyp('cxxflags.gyp')
finally:
# We clear the environ after calling gyp. When the auto-regeneration happens,
@@ -47,7 +46,6 @@
try:
PushEnv()
- os.environ['CXXFLAGS'] = '-O2'
test.run_gyp('cxxflags.gyp')
finally:
# We clear the environ after calling gyp. When the auto-regeneration happens,
--- Source/JavaScriptCore/JavaScriptCore.pro.orig 2011-12-06 07:21:30.056120087 +0100
+++ Source/JavaScriptCore/JavaScriptCore.pro 2011-12-06 07:21:38.125245164 +0100
@@ -26,9 +26,6 @@
# Remove the following 2 lines if you want debug information in JavaScriptCore
}
-*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
-*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
-
# Rules when JIT enabled (not disabled)
!contains(DEFINES, ENABLE_JIT=0) {
linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
--- Source/ThirdParty/gyp/test/cflags/gyptest-cflags.py.orig 2011-12-06 07:42:38.432776694 +0100
+++ Source/ThirdParty/gyp/test/cflags/gyptest-cflags.py 2011-12-06 07:42:47.822922219 +0100
@@ -28,7 +28,6 @@
try:
PushEnv()
- os.environ['CFLAGS'] = '-O0'
test.run_gyp('cflags.gyp')
finally:
# We clear the environ after calling gyp. When the auto-regeneration happens,
@@ -47,7 +47,7 @@
try:
PushEnv()
- os.environ['CFLAGS'] = '-O2'
+ os.environ['CFLAGS'] = '-O1'
test.run_gyp('cflags.gyp')
finally:
# We clear the environ after calling gyp. When the auto-regeneration happens,
--- Source/WebKit.pri
+++ Source/WebKit.pri
@@ -1,5 +1,8 @@
# Include file to make it easy to include WebKit into Qt projects
+QMAKE_CFLAGS_RELEASE = ""
+QMAKE_CXXFLAGS_RELEASE = ""
+
contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
# Detect that we are building as a standalone package by the presence of
--- Tools/Tools.pro.orig 2011-12-06 08:25:34.777703423 +0100
+++ Tools/Tools.pro 2011-12-06 08:26:19.511396680 +0100
@@ -2,6 +2,9 @@
TEMPLATE = subdirs
CONFIG += ordered
+QMAKE_CFLAGS_RELEASE = ""
+QMAKE_CXXFLAGS_RELEASE = ""
+
include($$PWD/../Source/common.pri)
include($$PWD/../Source/WebCore/features.pri)