rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 603791 from home:Guillaume_G:branches:openSUSE:Factory:ARM

Browse Source 
- Fix armv7 build by:
  * adding RUSTFLAGS="-Cdebuginfo=0"
  * updating _constraints for %arm

OBS-URL: https://build.opensuse.org/request/show/603791
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=654
This commit is contained in:
Wolfgang Rosenauer 2018-05-07 08:31:01 +00:00 committed by Git OBS Bridge
parent ab10e8708d
commit f9f24f9c98
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MozillaFirefox.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu May 3 14:33:37 UTC 2018 - guillaume.gardet@opensuse.org
- Fix armv7 build by:
* adding RUSTFLAGS="-Cdebuginfo=0"
* updating _constraints for %arm
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 2 20:46:37 UTC 2018 - wr@rosenauer.org Wed May 2 20:46:37 UTC 2018 - wr@rosenauer.org

7
MozillaFirefox.spec
View File

@ -321,6 +321,9 @@ export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now"
export CFLAGS="$CFLAGS -mminimal-toc" export CFLAGS="$CFLAGS -mminimal-toc"
%endif %endif
export CXXFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS"
%ifarch %{arm}
export RUSTFLAGS="-Cdebuginfo=0"
%endif
export MOZCONFIG=$RPM_BUILD_DIR/mozconfig export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
cat << EOF > $MOZCONFIG cat << EOF > $MOZCONFIG
mk_add_options MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1
@ -375,8 +378,12 @@ ac_add_options --disable-crashreporter
%ifarch %arm %ifarch %arm
ac_add_options --with-fpu=vfpv3-d16 ac_add_options --with-fpu=vfpv3-d16
ac_add_options --with-float-abi=hard ac_add_options --with-float-abi=hard
%ifarch armv6l armv6hl
ac_add_options --with-arch=armv6
%else
ac_add_options --with-arch=armv7-a ac_add_options --with-arch=armv7-a
%endif %endif
%endif
%ifarch %arm s390x %ifarch %arm s390x
ac_add_options --disable-webrtc ac_add_options --disable-webrtc
%endif %endif

11
_constraints
View File

@ -10,19 +10,10 @@
</hardware> </hardware>
<overwrite> <overwrite>
<conditions> <conditions>
<arch>aarch64</arch>
<arch>armv6l</arch> <arch>armv6l</arch>
<arch>armv7l</arch> <arch>armv7l</arch>
</conditions> </conditions>
<hardware>
<memory>
<size unit="M">2600</size>
</memory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>aarch64</arch>
</conditions>
<hardware> <hardware>
<memory> <memory>
<size unit="G">9</size> <size unit="G">9</size>