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

- 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

MozillaFirefox.changes

@@ -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
 

MozillaFirefox.spec

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

_constraints

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