rpms/qt5-qtbase
7
0
Fork 0
Code Issues Pull Requests Releases Activity

re-enable gold linker (#1458003)

Browse Source 
drop qt5_null_flag/qt5_deprecated_flag hacks (should be fixed upstream for awhile)
make qt_settings/journald support unconditional
This commit is contained in:
Rex Dieter 2018-01-26 12:27:57 -06:00
parent a2f4fa4db9
commit 507fe0eddd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qt5-qtbase.spec
View File

@ -27,26 +27,22 @@
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
%if 0%{?fedora} > 21
# use external qt_settings pkg # use external qt_settings pkg
%global qt_settings 1 %global qt_settings 1
%endif
# See http://bugzilla.redhat.com/1279265 # See http://bugzilla.redhat.com/1279265
%if 0%{?fedora} < 24 %if 0%{?fedora} < 24
%global inject_optflags 1 %global inject_optflags 1
%endif %endif
%if 0%{?fedora} > 23 || 0%{?rhel} > 6
%global journald -journald %global journald -journald
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
%endif
%if 0%{?fedora} > 23 %if 0%{?fedora} > 23
# gcc6: FTBFS # gcc6: FTBFS
%global qt5_deprecated_flag -Wno-deprecated-declarations #global qt5_deprecated_flag -Wno-deprecated-declarations
# gcc6: Qt assumes this in places # gcc6: Qt assumes this in places
%global qt5_null_flag -fno-delete-null-pointer-checks #global qt5_null_flag -fno-delete-null-pointer-checks
%endif %endif
%global examples 1 %global examples 1
@ -55,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.10.0 Version: 5.10.0
Release: 1%{?dist} Release: 2%{?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
@ -225,9 +221,8 @@ Requires: %{name}-common = %{version}-%{release}
# workaround gold linker bug by not using it # workaround gold linker bug by not using it
# https://bugzilla.redhat.com/1458003 # https://bugzilla.redhat.com/1458003
# https://sourceware.org/bugzilla/show_bug.cgi?id=21074 # https://sourceware.org/bugzilla/show_bug.cgi?id=21074
%if 0%{?fedora} > 26 # reportedly fixed or worked-around, re-enable if there's evidence of problems -- rex
%global use_gold_linker -no-use-gold-linker #global use_gold_linker -no-use-gold-linker
%endif
%description %description
Qt is a software toolkit for developing applications. Qt is a software toolkit for developing applications.
@ -980,6 +975,11 @@ fi
%changelog %changelog
* Fri Jan 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.0-2
- re-enable gold linker (#1458003)
- drop qt5_null_flag/qt5_deprecated_flag hacks (should be fixed upstream for awhile)
- make qt_settings/journald support unconditional
* Fri Dec 15 2017 Jan Grulich <jgrulich@redhat.com> - 5.10.0-1 * Fri Dec 15 2017 Jan Grulich <jgrulich@redhat.com> - 5.10.0-1
- 5.10.0 - 5.10.0