pool/MozillaFirefox
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 657818 from home:Guillaume_G:branches:mozilla:Factory

Browse Source 
- Switch aarch64 builds back to gcc, not clang (bmo#1513605)
- Switch %arm builds back to gcc, not clang to avoid OOM
- Fix build flags when clang is not used
- Fix flags for clang ppc64 builds

OBS-URL: https://build.opensuse.org/request/show/657818
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=700
This commit is contained in:
Wolfgang Rosenauer 2018-12-13 12:15:35 +00:00 committed by Git OBS Bridge
parent 7d565ee4aa
commit f2a1d1c9f4
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MozillaFirefox.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 12 17:33:29 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Switch aarch64 builds back to gcc, not clang (bmo#1513605)
- Switch %arm builds back to gcc, not clang to avoid OOM
- Fix build flags when clang is not used
- Fix flags for clang ppc64 builds
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 11 08:45:56 UTC 2018 - Wolfgang Rosenauer <wr@rosenauer.org> Tue Dec 11 08:45:56 UTC 2018 - Wolfgang Rosenauer <wr@rosenauer.org>

14
MozillaFirefox.spec
View File

@ -31,9 +31,16 @@
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
%define clang_build 1 %define clang_build 1
%endif %endif
# Except on aarch64 due to bmo#1513605
# and on %%arm due to large ld memory requirements
%ifarch %arm aarch64
%define clang_build 0
%endif
# PIE, full relro (x86_64 for now) # PIE, full relro (x86_64 for now)
%ifnarch %arm aarch64
%define build_hardened 1 %define build_hardened 1
%endif
# Firefox only supports i686 # Firefox only supports i686
%ifarch %ix86 %ifarch %ix86
@ -303,6 +310,11 @@ export BUILD_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1 export MOZ_TELEMETRY_REPORTING=1
%if 0%{?suse_version} <= 1320 %if 0%{?suse_version} <= 1320
export CC=gcc-7 export CC=gcc-7
%else
%if 0%{?clang_build} == 0
export CC=gcc
export CXX=g++
%endif
%endif %endif
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
# boo#986541: add -fno-delete-null-pointer-checks for gcc6 # boo#986541: add -fno-delete-null-pointer-checks for gcc6
@ -321,8 +333,10 @@ export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now"
%endif %endif
%endif %endif
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
%if 0%{?clang_build} == 0
export CFLAGS="$CFLAGS -mminimal-toc" export CFLAGS="$CFLAGS -mminimal-toc"
%endif %endif
%endif
export CXXFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS"
export MOZCONFIG=$RPM_BUILD_DIR/mozconfig export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
%limit_build -m 1500 %limit_build -m 1500