1
0
Dominique Leuenberger 2019-08-08 12:22:22 +00:00 committed by Git OBS Bridge
commit b3b1352c0a
3 changed files with 20 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 1 14:25:02 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update build constraints to fix arm builds
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 19 08:11:27 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org> Fri Jul 19 08:11:27 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>

View File

@ -350,7 +350,7 @@ export CFLAGS="$CFLAGS -mminimal-toc"
%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 2000
cat << EOF > $MOZCONFIG cat << EOF > $MOZCONFIG
mk_add_options MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1

View File

@ -2,7 +2,7 @@
<constraints> <constraints>
<hardware> <hardware>
<disk> <disk>
<size unit="G">22</size> <size unit="G">24</size>
</disk> </disk>
<memory> <memory>
<size unit="G">8</size> <size unit="G">8</size>
@ -12,11 +12,23 @@
<conditions> <conditions>
<arch>armv6l</arch> <arch>armv6l</arch>
<arch>armv7l</arch> <arch>armv7l</arch>
</conditions>
<hardware>
<disk>
<size unit="G">12</size>
</disk>
<memory>
<size unit="G">5</size>
</memory>
</hardware>
</overwrite>
<overwrite>
<conditions>
<arch>aarch64</arch> <arch>aarch64</arch>
</conditions> </conditions>
<hardware> <hardware>
<memory> <memory>
<size unit="G">9</size> <size unit="G">12</size>
</memory> </memory>
</hardware> </hardware>
</overwrite> </overwrite>