forked from pool/discover
Accepting request 568854 from home:wolfi323:test
- Build with gcc7 on Leap 42.3, gcc6 no longer works because of a change to the default compiler flags in openSUSE:Leap:42.3:Update (boo#1077345) OBS-URL: https://build.opensuse.org/request/show/568854 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=116
This commit is contained in:
parent
6b3b8b3ca1
commit
46da874c30
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 24 10:00:35 UTC 2018 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Build with gcc7 on Leap 42.3, gcc6 no longer works because of a
|
||||||
|
change to the default compiler flags in openSUSE:Leap:42.3:Update
|
||||||
|
(boo#1077345)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 15 15:54:02 CET 2018 - fabian@ritter-vogt.de
|
Mon Jan 15 15:54:02 CET 2018 - fabian@ritter-vogt.de
|
||||||
|
|
||||||
|
@ -27,7 +27,11 @@ Url: https://quickgit.kde.org/?p=discover.git
|
|||||||
Source: http://download.kde.org/unstable/plasma/%{version}/discover-%{version}.tar.xz
|
Source: http://download.kde.org/unstable/plasma/%{version}/discover-%{version}.tar.xz
|
||||||
%if 0%{?suse_version} < 1330
|
%if 0%{?suse_version} < 1330
|
||||||
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
|
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
|
||||||
|
%if 0%{?sle_version} < 120300
|
||||||
BuildRequires: gcc6-c++
|
BuildRequires: gcc6-c++
|
||||||
|
%else
|
||||||
|
BuildRequires: gcc7-c++
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: PackageKit-Qt5-devel
|
BuildRequires: PackageKit-Qt5-devel
|
||||||
BuildRequires: cmake >= 2.8.12
|
BuildRequires: cmake >= 2.8.12
|
||||||
@ -96,8 +100,13 @@ This is the systray plasmoid to notify the user that updates are available
|
|||||||
%build
|
%build
|
||||||
%if 0%{?suse_version} < 1330
|
%if 0%{?suse_version} < 1330
|
||||||
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
|
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
|
||||||
|
%if 0%{?sle_version} < 120300
|
||||||
export CC=gcc-6
|
export CC=gcc-6
|
||||||
export CXX=g++-6
|
export CXX=g++-6
|
||||||
|
%else
|
||||||
|
export CC=gcc-7
|
||||||
|
export CXX=g++-7
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%cmake_kf5 -d build -- -DBUILD_TESTING=ON
|
%cmake_kf5 -d build -- -DBUILD_TESTING=ON
|
||||||
%make_jobs
|
%make_jobs
|
||||||
|
Loading…
Reference in New Issue
Block a user