diff options
author | Javier Viguera <javier.viguera@digi.com> | 2015-02-19 18:56:50 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-21 11:34:48 -0200 |
commit | ca1d9e896d52aa48f33e1c760993ebafaedd63b3 (patch) | |
tree | fe6639478a9287a228caba5f99c61471cec304a5 | |
parent | 586ad3b476b234ac5bcb095cca308548005f9c39 (diff) | |
download | meta-fsl-arm-ca1d9e896d52aa48f33e1c760993ebafaedd63b3.tar.gz |
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 <javier.viguera@digi.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-qt/qt4/qt4/mx6/g++.conf | 30 |
1 files 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 @@ | |||
2 | # qmake configuration for common gcc | 2 | # qmake configuration for common gcc |
3 | # | 3 | # |
4 | 4 | ||
5 | QMAKE_COMPILER = gcc | ||
6 | |||
5 | QMAKE_CC = $(OE_QMAKE_CC) | 7 | QMAKE_CC = $(OE_QMAKE_CC) |
6 | QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) -DLINUX=1 -DEGL_API_FB=1 | 8 | QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS) -DLINUX=1 -DEGL_API_FB=1 |
7 | QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) | 9 | QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) |
8 | QMAKE_CFLAGS_DEPS += -M | ||
9 | QMAKE_CFLAGS_WARN_ON += -Wall -W | ||
10 | QMAKE_CFLAGS_WARN_OFF += -w | ||
11 | QMAKE_CFLAGS_RELEASE += | ||
12 | QMAKE_CFLAGS_DEBUG += -g | ||
13 | QMAKE_CFLAGS_SHLIB += -fPIC | ||
14 | QMAKE_CFLAGS_STATIC_LIB += -fPIC | ||
15 | QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses | ||
16 | QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden | ||
17 | QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | 10 | QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} |
18 | QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} | 11 | QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} |
19 | 12 | ||
20 | QMAKE_CXX = $(OE_QMAKE_CXX) | 13 | QMAKE_CXX = $(OE_QMAKE_CXX) |
21 | QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) | 14 | QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS) -DLINUX=1 -DEGL_API_FB=1 |
22 | QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS | ||
23 | QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON | ||
24 | QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF | ||
25 | QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE | ||
26 | QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO | 15 | QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO |
27 | QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG | ||
28 | QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB | ||
29 | QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB | ||
30 | QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC | ||
31 | QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden | ||
32 | QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | 16 | QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} |
33 | QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE | 17 | QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE |
34 | 18 | ||
@@ -37,9 +21,6 @@ QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) | |||
37 | QMAKE_LINK_C = $(OE_QMAKE_LINK) | 21 | QMAKE_LINK_C = $(OE_QMAKE_LINK) |
38 | QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) | 22 | QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) |
39 | QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) | 23 | QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) |
40 | QMAKE_LFLAGS_RELEASE += | ||
41 | QMAKE_LFLAGS_DEBUG += | ||
42 | QMAKE_LFLAGS_APP += | ||
43 | QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined | 24 | QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined |
44 | QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, | 25 | QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, |
45 | 26 | ||
@@ -49,6 +30,9 @@ QMAKE_PCH_OUTPUT_EXT = .gch | |||
49 | QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions | 30 | QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions |
50 | QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, | 31 | QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, |
51 | 32 | ||
33 | # do not depend on gdb | ||
34 | CONFIG -= gdb_dwarf_index | ||
35 | |||
52 | # some linking helper... | 36 | # some linking helper... |
53 | CONFIG += rpath_libdirs | 37 | CONFIG += rpath_libdirs |
54 | 38 | ||