aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Giulio Benetti <giulio.benetti@micronovasrl.com>2019-06-18 10:45:32 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-24 22:13:28 +0200
commitf5872268e94edd0acaf99ff23d17989e2e446952 (patch)
treee356e8f513c522058fd3e2d0f4c0da8c1d9f5934
parentebd55b155a390faad8ed564e746d64cf0426ae38 (diff)
downloadbuildroot-f5872268e94edd0acaf99ff23d17989e2e446952.tar.gz
buildroot-f5872268e94edd0acaf99ff23d17989e2e446952.tar.bz2
package/qt5/qt5base: disable predefined -Og optimization
Starting from Qt5 5.9.0, -optimize-debug is enabled by default for debug builds causing -Og flag to be appended to CFLAGS and consequently override TARGET_CFLAGS. We don't want this so let's pass -no-optimize-debug to QT5BASE_CONFIGURE_OPTS if QT5_VERSION_LATEST=y. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 5857ab6a96be17615a05ff4e6a91d8f475890980) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/qt5/qt5base/qt5base.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 1c20b67e4b..da1a11b266 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -27,6 +27,13 @@ QT5BASE_CONFIGURE_OPTS += \
-no-pch \
-shared
+# starting from version 5.9.0, -optimize-debug is enabled by default
+# for debug builds and it overrides -O* with -Og which is not what we
+# want.
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+QT5BASE_CONFIGURE_OPTS += -no-optimize-debug
+endif
+
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
QT5BASE_DEPENDENCIES += pcre
else