Skip to contentSkip to conversation

qt5base: fix build error

PATCH New yegorslists at googlemail.com 2 participants 2 messages Mar 24, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt5base: fix build error

From: Yegor Yefremov <[email protected]>

Apply upstream patch, that disables c++ standard compiler flags unconditionally for host builds.

Fixes:
http://autobuild.buildroot.net/results/895/8958cfb71efdd3ce32b2145237e865ca8a6a6a7f/

---
 ...tandard-compiler-flags-for-the-host-build.patch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch
package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch new file +44 -0
new file mode 100644
index 0000000..54e4db8
@@ -0,0 +1,44 @@
+From e69e69519661954716d59bfa5bbd0626515cfda9 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <[email protected]>
+Date: Thu, 3 Mar 2016 15:17:31 +0100
+Subject: [PATCH] Disable c++ standard compiler flags for the host build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is no test for c++ standard support for the host build
+(only for the target compiler/build) which leads to trouble
+in some cross compiling environments (old host compiler, new
+cross compiler):
+
+  g++: error: unrecognized command line option ?-std=c++1z?
+
+So disable c++ standard compiler flags unconditionally for host builds.
+
+Task-number: QTBUG-51644
+Change-Id: Ifb3042e125fe199a7e081740d1171d26ccacf0c5
+Reviewed-by: Oswald Buddenhagen <[email protected]>
+Signed-off-by: Yegor Yefremov <[email protected]>
+---
+ mkspecs/features/default_post.prf | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
+index cd8d885..561c8f4 100644
+--- a/mkspecs/features/default_post.prf
++++ b/mkspecs/features/default_post.prf
+@@ -95,7 +95,10 @@ breakpad {
+     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
+ }
+ 
+-c++11|c++14|c++1z {
++# Disable special compiler flags for host builds (needs to be changed for 5.7
++# to fall back to c++11 because since 5.7 c++11 is required everywhere,
++# including host builds).
++if(!host_build|!cross_compile):if(c++11|c++14|c++1z) {
+     c++1z:       cxxstd = CXX1Z
+     else: c++14: cxxstd = CXX14
+     else:        cxxstd = CXX11
+-- 
+2.1.4
+
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 qt5base: fix build error

Dear Yegor,

Please have a more precise commit log than just "fix build error" (e.g. qt5base: disable c++ standard compiler flags for the host build)

Le 24/03/2016 12:30, yegorslists at googlemail.com a ?crit :

Quoted 7 lines

From: Yegor Yefremov <[email protected]>

Apply upstream patch, that disables c++ standard compiler flags unconditionally for host builds.

Fixes:
http://autobuild.buildroot.net/results/895/8958cfb71efdd3ce32b2145237e865ca8a6a6a7f/

It also fix :
http://autobuild.buildroot.net/results/cc8b6f3713bd1140a4e8fef378525df1f1c88130/
http://autobuild.buildroot.net/results/3e9/3e96a9cf50671d845a664ca711c18f2a883a4737/
http://autobuild.buildroot.net/results/c16/c16066a111c475667eaa01c080e7207dc9cc4cf2/
http://autobuild.buildroot.net/results/af9/af95d158f38becc1004f5b59777afee740c0deae/
http://autobuild.buildroot.net/results/b5e/b5e7ba0c36fb8bff4037fcba89217bdcd840c9a0/

Otherwise you can add my

Regards,

Julien

Quoted 58 lines
---
  ...tandard-compiler-flags-for-the-host-build.patch | 44 ++++++++++++++++++++++
  1 file changed, 44 insertions(+)

create mode 100644 package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch

package/qt5/qt5base/0001-Disable-c-standard-compiler-flags-for-the-host-build.patch new file +44 -0
new file mode 100644
index 0000000..54e4db8
@@ -0,0 +1,44 @@
+From e69e69519661954716d59bfa5bbd0626515cfda9 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <[email protected]>
+Date: Thu, 3 Mar 2016 15:17:31 +0100
+Subject: [PATCH] Disable c++ standard compiler flags for the host build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There is no test for c++ standard support for the host build
+(only for the target compiler/build) which leads to trouble
+in some cross compiling environments (old host compiler, new
+cross compiler):
+
+  g++: error: unrecognized command line option ?-std=c++1z?
+
+So disable c++ standard compiler flags unconditionally for host builds.
+
+Task-number: QTBUG-51644
+Change-Id: Ifb3042e125fe199a7e081740d1171d26ccacf0c5
+Reviewed-by: Oswald Buddenhagen <[email protected]>
+Signed-off-by: Yegor Yefremov <[email protected]>
+---
+ mkspecs/features/default_post.prf | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
+index cd8d885..561c8f4 100644
+--- a/mkspecs/features/default_post.prf
++++ b/mkspecs/features/default_post.prf
+@@ -95,7 +95,10 @@ breakpad {
+     !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
+ }
+
+-c++11|c++14|c++1z {
++# Disable special compiler flags for host builds (needs to be changed for 5.7
++# to fall back to c++11 because since 5.7 c++11 is required everywhere,
++# including host builds).
++if(!host_build|!cross_compile):if(c++11|c++14|c++1z) {
+     c++1z:       cxxstd = CXX1Z
+     else: c++14: cxxstd = CXX14
+     else:        cxxstd = CXX11
+--
+2.1.4
+