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

Accepting request 139486 from openSUSE:Factory:ARM

Browse Source 
- enable build on ARM
- do not twiddle with the RPM_OPT_FLAGS optimisation settings
- raise memory limits for qemu builds

OBS-URL: https://build.opensuse.org/request/show/139486
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=14
This commit is contained in:
Petr Mladek 2012-10-29 08:28:09 +00:00 committed by Git OBS Bridge
parent 541869bc13
commit aac41f85f5
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libreoffice-l10n.spec
View File

@ -63,7 +63,7 @@ BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
ExcludeArch: %arm ia64 s390 s390x ExcludeArch: ia64 s390 s390x
%description %description
This source package is used to build the LibreOffice artwork This source package is used to build the LibreOffice artwork

2
libreoffice-l10n.spec.in
View File

@ -59,7 +59,7 @@ BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
ExcludeArch: %arm ia64 s390 s390x ExcludeArch: ia64 s390 s390x
%description %description
This source package is used to build the LibreOffice artwork This source package is used to build the LibreOffice artwork

7
libreoffice.changes
View File

@ -4,6 +4,13 @@ Tue Sep 25 09:57:15 UTC 2012 - idonmez@suse.com
- Instead of disabling optimizations completely, use -O2. - Instead of disabling optimizations completely, use -O2.
Fixes bnc#780611 Fixes bnc#780611
-------------------------------------------------------------------
Tue Jul 24 16:21:01 UTC 2012 - dmueller@suse.com
- enable build on ARM
- do not twiddle with the RPM_OPT_FLAGS optimisation settings
- raise memory limits for qemu builds
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 13 10:37:51 UTC 2012 - pmladek@suse.com Fri Jul 13 10:37:51 UTC 2012 - pmladek@suse.com

14
libreoffice.spec
View File

@ -636,7 +636,7 @@ Patch2003: zip-3.0-optflags.patch
Patch2004: zip-3.0-tempfile.patch Patch2004: zip-3.0-tempfile.patch
Patch2005: zip-notimestamp.patch Patch2005: zip-notimestamp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ExclusiveArch: %ix86 x86_64 ppc %arm
%description %description
LibreOffice is a comprehensive office package featuring a word LibreOffice is a comprehensive office package featuring a word
@ -1387,6 +1387,13 @@ cd -
# Parallel build settings ... # Parallel build settings ...
# dmake does not work with more than 64 jobs # dmake does not work with more than 64 jobs
lo_jobs="%{?jobs:%jobs}" lo_jobs="%{?jobs:%jobs}"
%ifarch %arm
%if ! 0%{?qemu_user_space_build:1}
# native hardware is not that powerful
lo_jobs=""
%endif
%endif
if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then
echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
lo_jobs="64" lo_jobs="64"
@ -1399,6 +1406,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
else else
mem_per_process=200 mem_per_process=200
fi fi
%if 0%{?qemu_user_space_build:1}
mem_per_process=400
%endif
max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([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"
@ -1435,7 +1445,7 @@ source /etc/profile.d/alljava.sh
export JAVA_HOME=%{java_home} export JAVA_HOME=%{java_home}
%endif %endif
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]/-O2/g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing"
CFLAGS="$ARCH_FLAGS" CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS export ARCH_FLAGS CFLAGS CXXFLAGS