Accepting request 536472 from home:fcrozat:branches:GNOME:Factory

- Enable gold linker on s390/s390x on SLE15/Tumbleweed.

OBS-URL: https://build.opensuse.org/request/show/536472
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=127
This commit is contained in:
Dominique Leuenberger 2017-10-25 20:58:31 +00:00 committed by Git OBS Bridge
parent 56037b4ba7
commit 37a32496cf
2 changed files with 18 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 24 14:29:11 UTC 2017 - fcrozat@suse.com
- Enable gold linker on s390/s390x on SLE15/Tumbleweed.
-------------------------------------------------------------------
Thu Sep 14 14:57:43 UTC 2017 - fezhang@suse.com

View File

@ -25,6 +25,15 @@
%define _jscver 4
%define _pkgconfig_suffix gtk-3.0
%define _name webkitgtk
# gold linker not available on old s390/s390x
%define _gold_linker 1
%if 0%{suse_version} < 1320
%ifarch s390 s390x
%define _gold_linker 0
%endif
%endif
Name: webkit2gtk3
Version: 2.18.0
Release: 0
@ -79,7 +88,7 @@ BuildRequires: pkgconfig(libxslt) >= 1.1.7
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(zlib)
%ifnarch s390 s390x
%if %{_gold_linker}
BuildRequires: binutils-gold
%endif
BuildRequires: gcc-c++ >= 4.9
@ -236,11 +245,10 @@ more.
%build
# Use linker flags to reduce memory consumption
%ifarch s390 s390x
# binutils-gold doesn't exist on s390x
%global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /')
%else
%if %{_gold_linker}
%global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /')
%else
%global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /')
%endif
%cmake \
-DCMAKE_BUILD_TYPE=Release \