From 57a02af4d33bd6c2a9270a1995e3b8db97f05292 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 8 Jun 2016 10:45:24 +0300 Subject: cross-localedef-native_2.20.bb: fix for gcc5 The build of cross-localedef-native is observed to fail under gcc5 hosts with multiple definition errors, e.g.: argp-help.o: In function `argp_fmtstream_write': argp-help.c:(.text+0x1da0): multiple definition of `argp_fmtstream_write' argp-fmtstream.o:argp-fmtstream.c:(.text+0x7a0): first defined here The problem is the change of the default C standard from gnu89 to gnu11 which changes the semantics of 'inline'. The issue is described in the Porting guide at https://gcc.gnu.org/gcc-5/porting_to.html. Adding the '-fgnu89-inline' option fixes the issue. (This fix, including the above explanation, was shamelessly copied from http://git.vahanus.net/?p=csc/ptxdist-kp.git;a=commit;h=2f04a3587bd33c74ccc9be6e115a8b1fde620841.) Task-number: QTBUG-53862 Change-Id: I88b351b618c2aa9838ec5be6108a26369db5d760 Reviewed-by: Heikki Halmet --- recipes/glibc/cross-localedef-native_2.20.bbappend | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes/glibc/cross-localedef-native_2.20.bbappend diff --git a/recipes/glibc/cross-localedef-native_2.20.bbappend b/recipes/glibc/cross-localedef-native_2.20.bbappend new file mode 100644 index 0000000..c673b1e --- /dev/null +++ b/recipes/glibc/cross-localedef-native_2.20.bbappend @@ -0,0 +1,23 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +CFLAGS += "-fgnu89-inline" -- cgit v1.2.3-54-g00ecf