pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 828065 from home:marxin:memory-constraint

Browse Source 
Use memoryperjob constraint instead of %limit_build macro.

OBS-URL: https://build.opensuse.org/request/show/828065
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=914
This commit is contained in:
Tomáš Chvátal 2020-08-20 08:57:46 +00:00 committed by Git OBS Bridge
parent 59ae73009e
commit 37a3e7ea34
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_constraints
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<constraints> <constraints>
<hardware> <hardware>
<physicalmemory> <physicalmemory>
@ -6,5 +7,8 @@
<disk> <disk>
<size unit="G">25</size> <size unit="G">25</size>
</disk> </disk>
<memoryperjob>
<size unit="M">1200</size>
</memoryperjob>
</hardware> </hardware>
</constraints> </constraints>

5
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 20 08:55:05 UTC 2020 - Martin Liška <mliska@suse.cz>
- Use memoryperjob constraint instead of %limit_build macro.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 17 06:42:35 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> Mon Aug 17 06:42:35 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

2
libreoffice.spec
View File

@ -147,7 +147,6 @@ BuildRequires: libserializer
BuildRequires: libtool BuildRequires: libtool
BuildRequires: lpsolve-devel BuildRequires: lpsolve-devel
BuildRequires: make BuildRequires: make
BuildRequires: memory-constraints
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: pentaho-libxml BuildRequires: pentaho-libxml
BuildRequires: pentaho-reporting-flow-engine BuildRequires: pentaho-reporting-flow-engine
@ -1000,7 +999,6 @@ echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
# Strip lto from %_lto_cflags as the project has --enable-lto option # Strip lto from %_lto_cflags as the project has --enable-lto option
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
# do not eat all memory # do not eat all memory
%limit_build -m 1200
# make sure that JAVA_HOME is set correctly # make sure that JAVA_HOME is set correctly
source %{_sysconfdir}/profile.d/alljava.sh source %{_sysconfdir}/profile.d/alljava.sh
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...