From a976d88ec6daeb14d32fd851655b0c3b72f1074e Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 19 Feb 2015 18:56:33 +0100 Subject: qt4: sync g++.conf file with upstream Since this g++.conf file was added to fix some MX6 issues the upstream version of the file in which it's based has received some more fixes: http://git.openembedded.org/openembedded-core/commit/?id=6456b596a73232429e0d223089f32dc350ea20b0 http://git.openembedded.org/openembedded-core/commit/?id=6c78f629323bea0be44181d60e3ce45be0416093 http://git.openembedded.org/openembedded-core/commit/?id=3c49c575632cdac7bf950439b33773f09ae63354 This commit fixes an error building QT applications in debug mode (CONFIG+=debug in the QT project file) with a toolchain generated for a MX6 machine (with populate_sdk). Signed-off-by: Javier Viguera Signed-off-by: Otavio Salvador --- recipes-qt/qt4/qt4/mx6/g++.conf | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/recipes-qt/qt4/qt4/mx6/g++.conf b/recipes-qt/qt4/qt4/mx6/g++.conf index 4a4729e..915ecba 100644 --- a/recipes-qt/qt4/qt4/mx6/g++.conf +++ b/recipes-qt/qt4/qt4/mx6/g++.conf @@ -2,33 +2,17 @@ # qmake configuration for common gcc # +QMAKE_COMPILER = gcc + QMAKE_CC = $(OE_QMAKE_CC) -QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) -DLINUX=1 -DEGL_API_FB=1 +QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS) -DLINUX=1 -DEGL_API_FB=1 QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) -QMAKE_CFLAGS_DEPS += -M -QMAKE_CFLAGS_WARN_ON += -Wall -W -QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -QMAKE_CFLAGS_DEBUG += -g -QMAKE_CFLAGS_SHLIB += -fPIC -QMAKE_CFLAGS_STATIC_LIB += -fPIC -QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) -QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS) -DLINUX=1 -DEGL_API_FB=1 QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE @@ -37,9 +21,6 @@ QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) QMAKE_LINK_C = $(OE_QMAKE_LINK) QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) -QMAKE_LFLAGS_RELEASE += -QMAKE_LFLAGS_DEBUG += -QMAKE_LFLAGS_APP += QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, @@ -49,6 +30,9 @@ QMAKE_PCH_OUTPUT_EXT = .gch QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, +# do not depend on gdb +CONFIG -= gdb_dwarf_index + # some linking helper... CONFIG += rpath_libdirs -- cgit v1.2.3-54-g00ecf