package/qt5base: fix building with correct optimization
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/1 package/qt5base: fix building with correct optimization
In Qt5 mkspecs/features/default_post.prf(included after our qmake.conf):
debug {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_DEBUG
QMAKE_LFLAGS += $$QMAKE_LFLAGS_DEBUG
QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_DEBUG
} else {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE
QMAKE_LFLAGS += $$QMAKE_LFLAGS_RELEASE
QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
}QMAKE_CFLAGS is set to QMAKE_CFLAGS_RELEASE that in order is set to one of QMAKE_CFLAGS_OPTIMIZE depending on qt5 optimization chosen. Unfortunately patch:
https://git.buildroot.net/buildroot/commit/?id=7c0aa83527e0b0179f9e3f73a3e63df1fdc5a6e6
is not enough, since QMAKE_CFLAGS_RELEASE is set to QMAKE_CFLAGS_OPTIMIZE in a unique file, resulting in resetting QMAKE_CFLAGS_OPTIMIZE only after QMAKE_FLAGS_RELEASE is set.
The only way is to directly reset:QMAKE_CFLAGS_RELEASEQMAKE_CFLAGS_DEBUGQMAKE_CXXFLAGS_RELEASEQMAKE_CXXFLAGS_DEBUG
in our qmake.conf.in.
This package is also affected by BR2_TOOLCHAIN_HAS_GCC_BUG_90620 and it's been worked around by appending -O0 to CFLAGS/CXXFLAGS. This bug prevented workaround to work overriding optimization flags, so solving this also solves workaround problem.
Fixes:
http://autobuild.buildroot.net/results/ada/adaa9b4bcc6f9d2b5e82c479859a07e8abf5cf13/
http://autobuild.buildroot.net/results/a83/a83bdd1f3bf309c07abebe871b017c331ed36e67/
---V1->V2:
* rewritten entire commit log
--- package/qt5/qt5base/qmake.conf.in | 4 ++++ 1 file changed, 4 insertions(+)
package/qt5/qt5base/qmake.conf.in +4 -0
@@ -19,6 +19,10 @@ QMAKE_CFLAGS_OPTIMIZE = QMAKE_CFLAGS_OPTIMIZE_DEBUG = QMAKE_CFLAGS_OPTIMIZE_FULL = QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl
Signature · 1 line
2.20.1
PATCH v2 1/1 package/qt5base: fix building with correct optimization
Quoted 12 lines · Giulio Benetti
In Qt5 mkspecs/features/default_post.prf(included after our qmake.conf):
debug { QMAKE_CFLAGS += $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_DEBUG QMAKE_LFLAGS += $$QMAKE_LFLAGS_DEBUG QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_DEBUG } else { QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE QMAKE_LFLAGS += $$QMAKE_LFLAGS_RELEASE QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE }
Quoted 7 lines
QMAKE_CFLAGSis set toQMAKE_CFLAGS_RELEASEthat in order is set to one ofQMAKE_CFLAGS_OPTIMIZEdepending on qt5 optimization chosen. Unfortunately patch:
https://git.buildroot.net/buildroot/commit/?id=7c0aa83527e0b0179f9e3f73a3e63df1fdc5a6e6
is not enough, sinceQMAKE_CFLAGS_RELEASEis set toQMAKE_CFLAGS_OPTIMIZEin a unique file, resulting in resettingQMAKE_CFLAGS_OPTIMIZEonly afterQMAKE_FLAGS_RELEASEis set.
Forgot to mention:QMAKE_CFLAGS_OPTIMIZE is set in mkspecs/common/gcc-base.conf (the unique file).
Quoted 40 lines
The only way is to directly reset:
QMAKE_CFLAGS_RELEASEQMAKE_CFLAGS_DEBUGQMAKE_CXXFLAGS_RELEASEQMAKE_CXXFLAGS_DEBUG
in our qmake.conf.in.This package is also affected by
BR2_TOOLCHAIN_HAS_GCC_BUG_90620and it's been worked around by appending -O0 to CFLAGS/CXXFLAGS. This bug prevented workaround to work overriding optimization flags, so solving this also solves workaround problem.Fixes:
http://autobuild.buildroot.net/results/ada/adaa9b4bcc6f9d2b5e82c479859a07e8abf5cf13/
http://autobuild.buildroot.net/results/a83/a83bdd1f3bf309c07abebe871b017c331ed36e67/Signed-off-by Giulio Benetti <[email protected]>---
V1->V2:
* rewritten entire commit log--- package/qt5/qt5base/qmake.conf.in | 4 ++++ 1 file changed, 4 insertions(+)package/qt5/qt5base/qmake.conf.in +4
-0@@ -19,6 +19,10 @@ QMAKE_CFLAGS_OPTIMIZE = QMAKE_CFLAGS_OPTIMIZE_DEBUG = QMAKE_CFLAGS_OPTIMIZE_FULL = QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl
Signature · 2 lines
Giulio Benetti Benetti Engineering sas