summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2014-08-07 17:25:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 12:12:34 +0100
commitf62150b09e303b157cd9edd446ccf256a6c3a33f (patch)
treebe0362f67b579b129e04677e7c5f7bbcc9de9e72 /meta
parenta37c81cb094bf1986373e067cd72acaff559fad5 (diff)
downloadpoky-f62150b09e303b157cd9edd446ccf256a6c3a33f.tar.gz
qt4: Avoid duplicate flags in the g++-unix.conf
The removed flags from this g++.conf file, which is installed to the target as g++-unix.conf are added by gcc-base.conf . Do not add those flags twice. (From OE-Core rev: 3c49c575632cdac7bf950439b33773f09ae63354) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/g++.conf25
1 files changed, 2 insertions, 23 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf
index 8755031017..be78c249e9 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf
@@ -5,32 +5,14 @@
5QMAKE_COMPILER = gcc 5QMAKE_COMPILER = gcc
6 6
7QMAKE_CC = $(OE_QMAKE_CC) 7QMAKE_CC = $(OE_QMAKE_CC)
8QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) 8QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS)
9QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) 9QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
10QMAKE_CFLAGS_DEPS += -M
11QMAKE_CFLAGS_WARN_ON += -Wall -W
12QMAKE_CFLAGS_WARN_OFF += -w
13QMAKE_CFLAGS_RELEASE +=
14QMAKE_CFLAGS_DEBUG += -g
15QMAKE_CFLAGS_SHLIB += -fPIC
16QMAKE_CFLAGS_STATIC_LIB += -fPIC
17QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
18QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
19QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 10QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
20QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} 11QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
21 12
22QMAKE_CXX = $(OE_QMAKE_CXX) 13QMAKE_CXX = $(OE_QMAKE_CXX)
23QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) 14QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS)
24QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
25QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
26QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
27QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
28QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO 15QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
29QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
30QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
31QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
32QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
33QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
34QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 16QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
35QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 17QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
36 18
@@ -39,9 +21,6 @@ QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
39QMAKE_LINK_C = $(OE_QMAKE_LINK) 21QMAKE_LINK_C = $(OE_QMAKE_LINK)
40QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) 22QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
41QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) 23QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
42QMAKE_LFLAGS_RELEASE +=
43QMAKE_LFLAGS_DEBUG +=
44QMAKE_LFLAGS_APP +=
45QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined 24QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
46QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, 25QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
47 26