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

Accepting request 286505 from LibreOffice:Factory

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/286505
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger 2015-02-20 11:42:47 +00:00 committed by Git OBS Bridge
commit 84e626fd6f
2 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libreoffice.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Feb 10 12:49:37 UTC 2015 - tchvatal@suse.com
- Reduce bit the compilation preparations as we prepped most of the
things by _constraints and it is no longer needed
-------------------------------------------------------------------
Mon Feb 9 18:00:17 UTC 2015 - tchvatal@suse.com
- %pre is not enough the script needs to be rewritten in lua
-------------------------------------------------------------------
Mon Feb 9 10:26:08 UTC 2015 - tchvatal@suse.com
- Move removal of obsolete dirs from %pretrans to %pre bnc#916181
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 29 14:35:49 UTC 2015 - tchvatal@suse.com Thu Jan 29 14:35:49 UTC 2015 - tchvatal@suse.com

20
libreoffice.spec
View File

@ -870,40 +870,22 @@ free
echo "System limits:" echo "System limits:"
ulimit -a ulimit -a
lo_jobs_reduced= lo_jobs_reduced=
if test -e "%{_libexecdir}/icecc/bin/gcc" -a -e "%{_libexecdir}/icecc/bin/g++" ; then
PARALLEL_BUILD="$PARALLEL_BUILD --enable-icecream"
else
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
if test `uname -i` = "x86_64" ; then
mem_per_process=1000
else
mem_per_process=800
fi
%if 0%{?qemu_user_space_build:1}
mem_per_process=1200 mem_per_process=1200
%endif
max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p"` max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p"`
max_jobs="$(($max_mem / $mem_per_process))" max_jobs="$(($max_mem / $mem_per_process))"
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
test "$lo_jobs" -le 0 && lo_jobs=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits" test "$lo_jobs" -le 0 && lo_jobs=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits"
fi fi
fi
# finally set jobs # finally set jobs
PARALLEL_BUILD= PARALLEL_BUILD=
if test -n "$lo_jobs" ; then if test -n "$lo_jobs" ; then
PARALLEL_BUILD="--with-parallelism=$lo_jobs" PARALLEL_BUILD="--with-parallelism=$lo_jobs"
fi fi
# using icecream
# 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, ...
# FIXME: use -g1 instead of -g; the .o files need about 12GB disk space with full debugging symbols; there is not enough disk space and not enough memory for linking libmerged on the build hosts ARCH_FLAGS="%{optflags}"
# 12.3 has broken cppconnector with wrong incude paths
%if 0%{?suse_version} == 01230
ARCH_FLAGS="`echo %{optflags} | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing -I%{_includedir}/mysql-connector/ "
%else
ARCH_FLAGS="`echo %{optflags} | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing"
%endif
CFLAGS="$ARCH_FLAGS" CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS export ARCH_FLAGS CFLAGS CXXFLAGS