fix build issue with gcc6

This commit is contained in:
Than Ngo 2016-02-17 16:54:27 +01:00
parent 07c53f1b65
commit f746e0497d
2 changed files with 6 additions and 4 deletions

View File

@ -44,7 +44,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.6.0 Version: 5.6.0
Release: 0.27.%{prerelease}%{?dist} Release: 0.28.%{prerelease}%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -352,7 +352,7 @@ RPM macros for building Qt5 packages.
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
# add -fno-delete-null-pointer-checks for f24/gcc6 # add -fno-delete-null-pointer-checks for f24/gcc6
%if 0%{?fedora} > 23 %if 0%{?fedora} > 23
QT5_RPM_OPT_FLAGS="-fno-delete-null-pointer-checks" QT5_RPM_OPT_FLAGS="-fno-delete-null-pointer-checks -Wno-deprecated-declaration"
RPM_OPT_FLAGS="$RPM_OPT_FLAGS $QT5_RPM_OPT_FLAGS" RPM_OPT_FLAGS="$RPM_OPT_FLAGS $QT5_RPM_OPT_FLAGS"
%ifarch armv7hl %ifarch armv7hl
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mfpu=neon" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mfpu=neon"
@ -932,6 +932,9 @@ fi
%changelog %changelog
* Wed Feb 17 2016 Than Ngo <than@redhat.com> - 5.6.0-0.28.rc
- fix build issue with gcc6
* Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.27.rc * Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.27.rc
- Update proper tarball. Need avoid the fix branch - Update proper tarball. Need avoid the fix branch

View File

@ -1,2 +1 @@
448c461b1d8ebbf2c783fb36a7a11ffe sources d7c3bd870442ef3b169aa1eb939ae3a1 qtbase-opensource-src-5.6.0-rc.tar.xz
8e7fc2a6cd7867f505bd0c1ba126739c qtbase-opensource-src-5.6.0-rc.tar.xz